更新

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationDto.java

@@ -98,6 +98,9 @@ public class JgUseRegistrationDto  extends BaseDto {
     private String equCode;
 
 
- private List<String> roleIds;
+    private List<String> roleIds;
 
+    private  String dataType  ;
+
+    private String unitCode;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -158,4 +158,16 @@ public class JgUseRegistration extends BaseEntity {
 
     @TableField("instance_status")
     private String instanceStatus;
+
+    @TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    @TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -16,12 +16,13 @@
         use.USE_INNER_CODE as innerCode,
         concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
         ur.instance_id as instanceId,
-        re.equip_id as equipId,
-        ur.apply_no as applyNo
+        re.equ_id as equipId,
+        ur.apply_no as applyNo,
+        ur.next_execute_ids as nextExecuteIds
         from tzs_jg_use_registration ur
-        LEFT JOIN tzs_jg_relation_equip re  on ur.sequence_nbr = re.business_id
-        LEFT JOIN idx_biz_jg_register_info jri  on re.equip_id = jri.RECORD
-        LEFT JOIN idx_biz_jg_use_info  use   on re.equip_id = use.RECORD
+        LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
+        LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
+        LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
 
         <where>
             and  ur.is_delete = 0
@@ -37,11 +38,17 @@
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
-        <if test="roleIds != null">
-            <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
-                instance_status like #{role}
-            </foreach>
-        </if>
+            <if test="roleIds != null">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
+            <if test="dto.dataType == 'jg' ">
+                and  ur.receive_company_code = #{dto.unitCode}
+            </if>
+            <if test="dto.dataType == 'company' ">
+                and  ur.use_unit_credit_code = #{dto.unitCode}
+            </if>
         </where>
             order by ur.rec_date desc
     </select>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -108,7 +109,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setAuditStatus("待提交");
             jgUseRegistration.setStatus(UseStatusEnum.SUBMIT.getPass());
             this.save(jgUseRegistration);
-//            jgRelationEquip.setBusinessId(jgUseRegistration.getSequenceNbr().toString());
+            jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
             jgRelationEquipMapper.insert(jgRelationEquip);
         }
 
@@ -152,6 +153,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     public String flowExecute(String instanceId, String operate, String comment, Boolean update) {
         String role = "";
         String taskName = "流程结束";
+        ArrayList<String> roleList = new ArrayList<>();
         try {
             JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
             JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
@@ -176,14 +178,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                 for (Object datum : data) {
                     if (((Map) datum).containsKey("groupId")) {
-                        role = ((Map) datum).get("groupId").toString();
-                        continue;
+                        roleList.add(((Map) datum).get("groupId").toString());
                     }
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
+        role= String.join(",", roleList);
         if (update) {
             updateStatus(instanceId, taskName, role);
         }
@@ -198,6 +200,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setStatus(taskName);
             jgUseRegistration.setAuditStatus("已完成");
         } else {
+            jgUseRegistration.setNextExecuteIds(role);
             if (!ObjectUtils.isEmpty(jgUseRegistration.getInstanceStatus())) {
                 jgUseRegistration.setInstanceStatus(jgUseRegistration.getInstanceStatus() + "," + role);
             } else {