2024 7 1 号

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/MaterialMeterFormVO.java

@@ -51,4 +51,6 @@ public class MaterialMeterFormVO extends MaterialMeterForm {
 	@ApiModelProperty(value = "附件列表")
 	private List<AttachmentForm> fileList;
 
+	@ApiModelProperty(value = "上报u_task的主键Id")
+	private String taskId;
 }

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -100,8 +100,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class EVisaServiceImpl implements EVisaService {
 
-    private static final String SIGN_HOST = "172.30.224.79";
-    //private static final String SIGN_HOST = "47.115.117.246";
+    //private static final String SIGN_HOST = "172.30.224.79";
+    private static final String SIGN_HOST = "47.115.117.246";
 
     private static final String SIGN_PORT = "8183";
 
@@ -458,7 +458,7 @@ public class EVisaServiceImpl implements EVisaService {
                 String contractId = Func.toStrArray(dataInfo)[0];
                 String projectId = Func.toStrArray(dataInfo)[1];
 
-                if (taskFile.getRemarkType().equals("2")) {//东方 中讯 daMap.put("keyWord","1673632651551965184");
+                if (taskFile.getRemarkType().equals("2")) {
                     String sqlinfo = " SELECT * from ( SELECT a.id as keyWord,a.project_id,a.pyzbx ,a.pyzby,(SELECT acc_code from blade_user where id='" + task.getUserId() + "' and is_deleted=0  ) as sealId from m_textdict_info a where  a.type =2 and a.id in (" + ids + ")  and sig_role_id in (SELECT DISTINCT c.role_id from m_project_assignment_user c  where c.contract_id=" + contractId + " and user_id=" + task.getUserId() + " and c.is_deleted=0 ) ) x where x.sealId is not null ";
                     System.out.println("东方中讯-个人-user-id" + task.getUserId() + "--SQL=" + sqlinfo);
                     List<Map<String, Object>> maps2 = jdbcTemplate.queryForList(sqlinfo);

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/InterimPayCertificateController.java

@@ -69,7 +69,9 @@ public class InterimPayCertificateController extends BladeController {
 			interimPayCertificate.setPeriodNumber(contractMeterPeriod.getPeriodNumber());
 		}
 		interimPayCertificateService.add(interimPayCertificate);
-		taskController.calculate(interimPayCertificate.getId().toString(),0);
+
+		// taskType 10 代表任务查看pdf
+		taskController.calculate(interimPayCertificate.getId().toString(),0,1);
 		return R.success("新增成功");
 	}
 
@@ -99,7 +101,8 @@ public class InterimPayCertificateController extends BladeController {
 			interimPayCertificate.setPeriodNumber(contractMeterPeriod.getPeriodNumber());
 		}
 		interimPayCertificateService.update2(interimPayCertificate);
-		taskController.calculate(interimPayCertificate.getId().toString(),0);
+		// taskType 10 代表任务查看pdf
+		taskController.calculate(interimPayCertificate.getId().toString(),0,1);
 		return R.success("修改成功");
 	}
 

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MaterialStartStatementController.java

@@ -54,7 +54,7 @@ public class MaterialStartStatementController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入materialStartStatement,type:1材料2开工")
 	public R addOrUpdate(@Valid @RequestBody MaterialStartStatement materialStartStatement) {
 		materialStartStatementService.addOrUpdate(materialStartStatement);
-		taskController.calculate(materialStartStatement.getId().toString(),materialStartStatement.getType());
+		taskController.calculate(materialStartStatement.getId().toString(),materialStartStatement.getType(),1);
 		return R.success("操作成功");
 	}
 

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MaterialMeterFormMapper.xml

@@ -32,9 +32,28 @@
     </resultMap>
     <select id="meterPage" resultType="org.springblade.meter.vo.MaterialMeterFormVO">
         select *,
-            CASE when approve_status = 0 then '未上报' when approve_status = 1 then '待审批' when approve_status = 2 then '已审批'
-                 else '已废除' end as approveStatusName
-        from s_material_meter_form mmf
+        CASE when approve_status = 0 then '未上报' when approve_status = 1 then
+
+        CONCAT(
+        '待审批',
+        (
+        SELECT
+        IFNULL( CONCAT( '(', group_concat( CONCAT( c.task_user_name, ',', DATEDIFF( CURDATE(), c.create_time ))), ')' ),
+        '' ) AS taskUserInfo
+        FROM
+        u_task_parallel c,
+        u_task d
+        WHERE
+        c.process_instance_id = d.process_instance_id
+        AND d.form_data_id = a.meter_period_id
+        AND e_visa_status IS NULL
+        AND ( e_visa_content IS NULL OR e_visa_content = '' )
+        AND d.STATUS != 3
+        ))
+        when approve_status = 2 then '已审批'
+        else '已废除' end as approveStatusName,
+        ( SELECT id FROM u_task c WHERE a.meter_period_id = c.form_data_id ) AS taskId
+        from s_material_meter_form a
         where contract_id = #{contractId} and is_deleted = 0
         <if test="meterPeriodId!=null and meterPeriodId!=''">
             and meter_period_id = #{meterPeriodId}

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -101,36 +101,47 @@
     </select>
     <select id="page3" resultType="org.springblade.meter.vo.MiddleMeterApplyVO">
         SELECT a.*,b.period_number AS periodNumber ,
-        CASE
-        WHEN a.approve_status = 0 THEN
-        '未上报'
-        WHEN a.approve_status = 1 THEN
-            CONCAT('待审批',(
-                SELECT IFNULL(CONCAT( '(', group_concat( CONCAT( a.task_user_name, ',', DATEDIFF( CURDATE(), a.create_time ))), ')' ),"") AS taskUserInfo FROM u_task_parallel a,u_task b
-                    WHERE a.process_instance_id = b.process_instance_id AND b.form_data_id = b.id AND e_visa_status IS NULL AND (e_visa_content IS NULL or e_visa_content ='' ) AND b.STATUS != 3
-                ) )
-        WHEN a.approve_status = 2 THEN
-        '已审批' ELSE '已废除'
-        END AS approveStatusName ,
-        (SELECT id from u_task c where b.id=c.form_data_id) as task_id,
-        ( SELECT raw_url FROM s_interim_pay_certificate WHERE contract_id = #{apply.contractId}  AND contract_period_id = a.contract_period_id AND is_deleted = 0 ) AS periodPdfUrl
-        from
-        s_middle_meter_apply a ,s_contract_meter_period b
+            CASE
+                WHEN a.approve_status = 0 THEN
+                '未上报'
+                 WHEN a.approve_status = 1 THEN
+                    CONCAT('待审批',(
+                        SELECT
+                        IFNULL( CONCAT( '(', group_concat( CONCAT( c.task_user_name, ',', DATEDIFF( CURDATE(), c.create_time ))), ')' ),
+                        '' ) AS taskUserInfo
+                        FROM
+                        u_task_parallel c,
+                        u_task d
+                    WHERE
+                        c.process_instance_id = d.process_instance_id
+                        AND d.form_data_id = b.id
+                        AND e_visa_status IS NULL
+                        AND ( e_visa_content IS NULL OR e_visa_content = '' )
+                        AND d.STATUS != 3
+                    ) )
+                 WHEN a.approve_status = 2 THEN
+                    '已审批' ELSE '已废除'
+                 END AS approveStatusName ,
+            (SELECT id from u_task c where b.id=c.form_data_id AND c.STATUS != 3 ) as task_id,
+            ( SELECT raw_url FROM s_interim_pay_certificate WHERE contract_id = #{apply.contractId} AND contract_period_id =
+            a.contract_period_id AND is_deleted = 0 ) AS periodPdfUrl
+            from
+             s_middle_meter_apply a ,s_contract_meter_period b
         WHERE
-        a.contract_period_id = b.id
+            a.contract_period_id = b.id
         and a.contract_id = #{apply.contractId} and a.is_deleted = 0
         <if test="apply.contractPeriodId != -1">
             and a.contract_period_id = #{apply.contractPeriodId}
         </if>
-          and a.contract_unit_id in (
-                <foreach collection="ids" item="id"  separator=",">
-                    #{id}
-                </foreach>
-            )
+        and a.contract_unit_id in (
+        <foreach collection="ids" item="id" separator=",">
+            #{id}
+        </foreach>
+        )
         order by FIELD(a.contract_unit_id,
-            <foreach collection="ids" item="id"  separator=",">
-                #{id}
-            </foreach>
+        <foreach collection="ids" item="id" separator=",">
+            #{id}
+        </foreach>
         ),a.create_time
 
     </select>