fix(jg):维保备案bug

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

@@ -154,15 +154,10 @@ public class JgMaintenanceContractDto extends BaseDto {
 
     private List<String> roleIds;
 
-
-    /**
-     * 设备种类
-     */
+    @ApiModelProperty(value = "设备种类")
     private String equList;
-    /**
-     * 设备类别
-     */
 
+    @ApiModelProperty(value = "设备类别")
     private String equCategory;
 
     @ApiModelProperty(value = "设备品种")
@@ -174,17 +169,12 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "设备代码")
     private String equCode;
 
-    /**
-     * 工作流下一节点任务id
-     */
+    @ApiModelProperty(value = "工作流下一节点任务id")
     private String nextTaskId;
 
-    /**
-     * 下一节点可执行人
-     */
+    @ApiModelProperty(value = "下一节点可执行人")
     private String nextExecuteUserIds;
 
-
     @ApiModelProperty(value = "使用单位统一信用代码-数据隔离使用")
     private String useUnitCodeFilter;
 
@@ -199,4 +189,7 @@ public class JgMaintenanceContractDto extends BaseDto {
 
     @ApiModelProperty(value = "其他附件")
     private String otherAccessories;
+
+    @ApiModelProperty(value = "当前登陆人单位类型")
+    private String unitType;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgMaintenanceContractVo.java

@@ -11,20 +11,6 @@ import java.util.Map;
 
 @Data
 public class JgMaintenanceContractVo {
-    @TableField("使用单位-提交-是否可操作")
-    private Boolean submitIsFlag;
-
-    @TableField("使用单位-撤回-是否可操作")
-    private Boolean revocationIsFlag;
-
-    @TableField("维保单位-受理-是否可操作")
-    private Boolean handleIsFlag;
-
-    @TableField("维保单位-驳回-是否可操作")
-    private Boolean rejectedIsFlag;
-
-    @TableField("使用:0,维保:1,监管:2")
-    private String phase;
 
     @TableField("维保备案编号")
     private String applyNo;
@@ -153,7 +139,6 @@ public class JgMaintenanceContractVo {
     @ApiModelProperty("status")
     private String status;
 
-
     @ApiModelProperty("设备种类")
     private String equList;
 
@@ -162,18 +147,15 @@ public class JgMaintenanceContractVo {
 
     private List<? extends Map<?,?>> equipmentLists;
 
-    /**
-     * 工作流下一节点任务id
-     */
-    @ApiModelProperty("next_task_id")
+    @ApiModelProperty("工作流下一节点任务id")
     private String nextTaskId;
 
-    /**
-     * 安全管理员姓名联系方式
-     */
-    @ApiModelProperty("maintenance_manager_phone")
+    @ApiModelProperty("安全管理员姓名联系方式")
     private String maintenanceManagerPhone;
 
     @ApiModelProperty (value = "其他附件")
     private JSONArray otherAccessories;
+
+    @ApiModelProperty(value = "当前登陆人单位类型")
+    private String unitType;
 }

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

@@ -174,29 +174,34 @@
                 AND ri."EQU_CODE" like concat('%',#{contractDto.equCode},'%')
             </if>
             -- 数据过滤开始 ----------------------------------------------------
-            <choose>
-                <when test="contractDto.useUnitCodeFilter != '' and contractDto.useUnitCodeFilter != null and
-                    contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">
-                    -- 同时有使用单位和维保单位用
-                    and (
-                        tjmc.use_unit_code = #{contractDto.useUnitCodeFilter}
-                        or tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
-                        or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )
-                    )
-                </when>
-                <otherwise >
+<!--            <choose>-->
+<!--                <when test="contractDto.useUnitCodeFilter != '' and contractDto.useUnitCodeFilter != null and-->
+<!--                    contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">-->
+<!--                    &#45;&#45; 同时有使用单位和维保单位用-->
+<!--                    and (-->
+<!--                        tjmc.use_unit_code = #{contractDto.useUnitCodeFilter}-->
+<!--                        or tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}-->
+<!--                        or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )-->
+<!--                    )-->
+<!--                </when>-->
+<!--                <otherwise >-->
                     -- 只有使用单位或者维保单位用，或者都没有
                     <if test="contractDto.useUnitCodeFilter != '' and contractDto.useUnitCodeFilter != null">
-                        and (tjmc.use_unit_code = #{contractDto.useUnitCodeFilter} or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                        and (tjmc.use_unit_code = #{contractDto.useUnitCodeFilter}
+                            or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
                     </if>
                     <if test="contractDto.maintenanceUnitCodeFilter != '' and contractDto.maintenanceUnitCodeFilter != null">
-                        and (tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter} or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                        and (tjmc.maintenance_unit_code = #{contractDto.maintenanceUnitCodeFilter}
+                            or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                        and (tjmc.status <![CDATA[<>]]> '使用单位待提交' and tjmc.status <![CDATA[<>]]> '待提交')
                     </if>
-                </otherwise>
-            </choose>
+<!--                </otherwise>-->
+<!--            </choose>-->
             -- 监管单位用
             <if test="contractDto.receiveOrgCodeFilter != '' and contractDto.receiveOrgCodeFilter != null">
-                and (tjmc.receive_org_code = #{contractDto.receiveOrgCodeFilter} or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                and (tjmc.receive_org_code = #{contractDto.receiveOrgCodeFilter}
+                    or tjmc.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                and (tjmc.status <![CDATA[<>]]> '使用单位待提交' and tjmc.status <![CDATA[<>]]> '待提交')
             </if>
             -- 数据过滤结束 ----------------------------------------------------
         </where>

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/JgMaintenanceContractServiceImpl.java

@@ -124,6 +124,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             }
         }
         contractList = maintenanceContractMapper.getContractList(page, sortMap, dto, reginParams.getUserModel().getUserId());
+        List<JgMaintenanceContractDto> records = contractList.getRecords().stream().peek(x->x.setUnitType(company.getCompanyType())).collect(Collectors.toList());
+        contractList.setRecords(records);
         BeanUtils.copyProperties(contractList, result);
         return result;
     }