feat(jyjc): 报检开发调整

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/JyjcInspectionApplicationDto.java

@@ -8,8 +8,6 @@ import lombok.EqualsAndHashCode;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author system_generator
@@ -60,10 +58,8 @@ public class JyjcInspectionApplicationDto extends BaseModel {
     @ApiModelProperty(value = "申请说明")
     private String applicationRemark;
 
-    @ApiModelProperty(value = "项目负责人(检验员)")
+    @ApiModelProperty(value = "业务负责人")
     private String inspectionChargePerson;
-    @ApiModelProperty(value = "项目负责人(检验员)")
-    private String inspectionChargePersonName;
 
     @ApiModelProperty(value = "项目负责人联系电话（检验员联系电话）")
     private String inspectionChargePhone;
@@ -113,6 +109,12 @@ public class JyjcInspectionApplicationDto extends BaseModel {
     @ApiModelProperty(value = "备注(无用预留)")
     private String remark;
 
+    /**
+     * 备注2(预留)
+     */
+    @ApiModelProperty(value = "备注2(预留)")
+    private String remark2;
+
     @ApiModelProperty(value = "业务类型（与菜单对应拆表使用）")
     private String bizType;
 

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LiftingTechParamDefine.java

@@ -131,15 +131,15 @@ public class LiftingTechParamDefine implements ITechParamDefine {
     private BigDecimal checkFinishedHeight;
 
 
-    @TechnicalParameter(key = "parkingVehicleHeight", label = "适停车辆尺寸高", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
-    private BigDecimal parkingVehicleHeight;
+    @TechnicalParameter(key = "parkingVehicleHeight", label = "适停车辆尺寸高", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.STRING, unit = "m")
+    private String parkingVehicleHeight;
 
 
-    @TechnicalParameter(key = "parkingVehicleWeight", label = "适停车辆尺寸宽", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
-    private BigDecimal parkingVehicleWeight;
+    @TechnicalParameter(key = "parkingVehicleWeight", label = "适停车辆尺寸宽", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.STRING, unit = "m")
+    private String parkingVehicleWeight;
 
 
-    @TechnicalParameter(key = "parkingVehicleLength", label = "适停车辆尺寸长", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "m")
-    private BigDecimal parkingVehicleLength;
+    @TechnicalParameter(key = "parkingVehicleLength", label = "适停车辆尺寸长", equCategory = {"4D00"}, type = TechnicalParameter.ParamType.STRING, unit = "m")
+    private String parkingVehicleLength;
 
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PipelineTechParamDefine.java

@@ -41,8 +41,8 @@ public class PipelineTechParamDefine implements ITechParamDefine {
     private BigDecimal pipeLength;
 
 
-    @TechnicalParameter(key = "pressure", label = "设计压力", type = TechnicalParameter.ParamType.BIG_DECIMAL,unit = "Mpa")
-    private BigDecimal pressure;
+    @TechnicalParameter(key = "pressure", label = "设计压力", type = TechnicalParameter.ParamType.STRING,unit = "Mpa")
+    private String pressure;
 
 
     @TechnicalParameter(key = "temperature", label = "设计温度", type = TechnicalParameter.ParamType.STRING)

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/VesselTechParamsDefine.java

@@ -75,8 +75,8 @@ public class VesselTechParamsDefine implements ITechParamDefine {
     @TechnicalParameter(key = "glLossless", label = "无损检测方法（管路）", equCategory = {"2300"}, type = TechnicalParameter.ParamType.STRING)
     private String glLossless;
 
-    @TechnicalParameter(key = "heatTreatmentMethod", label = "热处理方式", equCategory = {"2300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "%")
-    private BigDecimal heatTreatmentMethod;
+    @TechnicalParameter(key = "heatTreatmentMethod", label = "热处理方式", equCategory = {"2300"}, type = TechnicalParameter.ParamType.STRING, unit = "%")
+    private String heatTreatmentMethod;
 
     @TechnicalParameter(key = "glPressure", label = "耐压试验压力（管路）", equCategory = {"2300"}, type = TechnicalParameter.ParamType.BIG_DECIMAL, unit = "MPa")
     private BigDecimal glPressure;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/refresh/handler/EquipmentRefreshHandler.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dao.EsEquipmentDao;
 import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
+import com.yeejoin.amos.boot.module.common.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.common.api.service.IDataRefreshHandler;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
@@ -69,7 +70,7 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
                 esEquipmentInfo.setInspections(BeanUtil.copyToList(inspectionDetectionInfos, ESEquipmentInfo.Inspection.class));
                 esEquipmentInfo.setMaintenances(lastMaintenanceRecordInfo.getSequenceNbr() != null ? Collections.singletonList(BeanUtil.copyProperties(lastMaintenanceRecordInfo, ESEquipmentInfo.Maintenance.class)) : new ArrayList<>());
                 esEquipmentInfo.setTechParams(this.buildTechParamByEquList(record, esEquipmentInfo.getEQU_LIST_CODE()));
-                if ("8000".equals(esEquipmentInfo.getEQU_LIST_CODE())) {
+                if (EquipmentClassifityEnum.YLGD.getCode().equals(esEquipmentInfo.getEQU_LIST_CODE())) {
                     List<ESEquipmentInfo.TechParam> techParams = esEquipmentInfo.getTechParams();
                     List<ESEquipmentInfo.TechParam> pipeLength = techParams.stream().filter(e -> e.getParamKey().equals("pipeLength") && e.getDoubleValue() != null).collect(Collectors.toList());
                     if (!ObjectUtils.isEmpty(pipeLength)) {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/common/BizCommonConstant.java

@@ -38,4 +38,19 @@ public interface BizCommonConstant {
      * 推送状态成功
      */
     String PUSH_STATUS_SUCCESS = "2";
+
+    /**
+     * 待分配业务负责人
+     */
+    String JS_DFP = "66190";
+
+    /**
+     * 已分配待确认
+     */
+    String JS_YFP_DQR = "66191";
+
+    /**
+     * 已分配已确认
+     */
+    String JS_YFP_YQR = "66192";
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionApplication.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -109,14 +110,11 @@ public class JyjcInspectionApplication extends BaseEntity {
     private String applicationRemark;
 
     /**
-     * 项目负责人(检验员)
+     * 业务负责人
      */
     @TableField("inspection_charge_person")
     private String inspectionChargePerson;
 
-    @TableField("inspection_charge_person_name")
-    private String inspectionChargePersonName;
-
     /**
      * 项目负责人联系电话（检验员联系电话）
      */
@@ -193,6 +191,13 @@ public class JyjcInspectionApplication extends BaseEntity {
     private String remark;
 
     /**
+     * 备注2(预留)
+     */
+    @TableField("remark2")
+    private String remark2;
+
+
+    /**
      * 业务类型（与菜单对应拆表使用）
      */
     @TableField("biz_type")
@@ -256,4 +261,12 @@ public class JyjcInspectionApplication extends BaseEntity {
      */
     @TableField("project_contraption_id")
     private String projectContraptionId;
+
+
+    /**
+     * 计划检验日期
+     */
+    @TableField("plan_inspection_date")
+    private LocalDate planInspectionDate;
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/InspectPlanStatusEnum.java

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+import lombok.Getter;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+@Getter
+public enum InspectPlanStatusEnum {
+    JS_DFP("待分配业务负责人", "66190"),
+    JS_YFP_DQR("已分配待确认", "66191"),
+    JS_YFP_YQR("已确认", "66192");
+
+    private final String name;
+
+    private final String value;
+
+    InspectPlanStatusEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public static InspectPlanStatusEnum getByValue(String value) {
+        for (InspectPlanStatusEnum e : InspectPlanStatusEnum.values()) {
+            if (e.value.equals(value)) {
+                return e;
+            }
+        }
+        throw new BadRequest("not support " + value);
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -26,9 +26,6 @@ import java.util.Set;
  */
 public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspectionApplication> {
 
-
-    Page<JyjcInspectionApplicationModel> queryForDataList(Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode, String applicationUnitName, String equipClassify, String inspectionUnitCode, String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status, String bizType);
-
     Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page, @Param("equipClassify") String equipClassify);
 
     JyjcInspectionApplicationModel selectDataBySeq(Long sequenceNbr);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/InspectionPlanModel.java

 package com.yeejoin.amos.boot.module.jyjc.api.model;
 
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -14,7 +17,7 @@ public class InspectionPlanModel  implements Serializable {
     /**
      * 计划检验检测日期
      */
-    String planInspectionDate;
+    LocalDate planInspectionDate;
 
     /**
      * 检验检测地点

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionApplicationModel.java

@@ -7,8 +7,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Setter;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -59,10 +61,8 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "申请说明")
     private String applicationRemark;
 
-    @ApiModelProperty(value = "项目负责人(检验员)")
+    @ApiModelProperty(value = "业务负责人")
     private String inspectionChargePerson;
-    @ApiModelProperty(value = "项目负责人(检验员)")
-    private String inspectionChargePersonName;
 
     @ApiModelProperty(value = "项目负责人联系电话（检验员联系电话）")
     private String inspectionChargePhone;
@@ -95,6 +95,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "工作流执行角色")
     private String workflowRole;
 
+    @Setter
     @ApiModelProperty(value = "工作流实例ID")
     private String processInstanceId;
 
@@ -112,6 +113,9 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "备注(无用预留)")
     private String remark;
 
+    @ApiModelProperty(value = "备注2(预留)")
+    private String remark2;
+
     @ApiModelProperty(value = "业务类型（与菜单对应拆表使用）")
     private String bizType;
 
@@ -156,7 +160,6 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String equListName;
 
 
-
     @ApiModelProperty(value = "设备类别code")
     private String equCategory;
 
@@ -188,6 +191,11 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "区县")
     private String county;
 
+    @ApiModelProperty(value = "计划检验日期")
+    private LocalDate planInspectionDate;
+
+    @ApiModelProperty(value = "登录人公司code")
+    private String loginPersonCompanyCode;
 
     /**
      * 是否必须处理： true-必须处理，false-可不予受理
@@ -201,7 +209,4 @@ public class JyjcInspectionApplicationModel extends BaseModel {
         return this.instanceId != null ? this.instanceId : this.processInstanceId;
     }
 
-    public void setProcessInstanceId(String processInstanceId) {
-        this.processInstanceId = processInstanceId;
-    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -2,65 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper">
 
-    <select id="queryForDataList"
-            resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
-        SELECT
-        tzjia.*,
-        cdd1.NAME AS inspectionClassify,
-        cdd3.NAME AS inspectionType,
-        cdd.NAME AS equipClassify,
-        tbei.use_unit AS applicationUnitName,
-        tbei1.use_unit AS inspectionUnitName,
-        cdd2.NAME AS statusName,
-        (select  group_concat(name)  from  tzs_user_info where  find_in_set(sequence_nbr,tzjia.inspection_charge_person))  as  inspectionChargePerson        FROM
-        tz_jyjc_inspection_application AS tzjia
-        LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
-        LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
-        LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify and cdd.type = 'BJSBZL'
-        LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
-        LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
-        LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type
-        <where>
-        <if test=" applicationNo != null and applicationNo != ''">
-            and application_no like concat('%',#{applicationNo},'%')
-        </if>
-        <if test="inspectionClassify != null and inspectionClassify != ''">
-            and inspection_classify = #{inspectionClassify}
-        </if>
-        <if test="inspectionUnitName != null and inspectionUnitName != ''">
-            and inspection_unit_name like concat('%',#{inspectionUnitName},'%'))
-        </if>
-        <if test="applicationUnitName != null and applicationUnitName != ''">
-            and application_unit_name like concat('%',#{applicationUnitName},'%'))
-        </if>
-        <if test="inspectionUnitCode != null and inspectionUnitCode != ''">
-            and inspection_unit_code = #{inspectionUnitCode} and status != '6610'
-        </if>
-        <if test="applicationUnitCode != null and applicationUnitCode != ''">
-            and application_unit_code = #{applicationUnitCode}
-        </if>
-        <if test="equipClassify != null and equipClassify != ''">
-            and equip_classify = #{equipClassify}
-        </if>
-        <if test="applicationDate != null">
-            and application_date = #{applicationDate}
-        </if>
-        <if test="acceptDate != null">
-            and accept_date = #{acceptDate}
-        </if>
-        <if test="inspectionChargePerson != null and inspectionChargePerson != ''">
-            and inspection_charge_person like concat('%',#{inspectionChargePerson},'%')
-        </if>
-        <if test="status != null and status != ''">
-            and status = #{status}
-        </if>
-        <if test="bizType != null and bizType != ''">
-            and biz_type = #{bizType}
-        </if>
-        </where>
-        order by tzjia.application_no desc
-    </select>
-
     <sql id="page-list">
         <![CDATA[/*+ set(query_dop 16)*/ ]]>
         WITH equip_data as (
@@ -90,9 +31,12 @@
                  LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type AND cdd3.TYPE = 'JYJC'
                  LEFT JOIN equip_data ed on ed.application_seq = tzjia.sequence_nbr
     </sql>
-
+    <sql id="validStatusList">
+        <bind name="statusList" value="@java.util.Arrays@asList('6610','6611','6614','6615','6616','6618')" />
+    </sql>
     <select id="selectForPage" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
         <include refid="page-list"/>
+        <include refid="validStatusList" />
         <where>
             <if test="jyjcInspectionApplicationModel.applicationNo != null and jyjcInspectionApplicationModel.applicationNo != ''">
                 and tzjia.application_no like concat('%',#{jyjcInspectionApplicationModel.applicationNo},'%')
@@ -110,14 +54,29 @@
             <if test="jyjcInspectionApplicationModel.acceptDate != null">
                 and tzjia.accept_date = #{jyjcInspectionApplicationModel.acceptDate}
             </if>
-            <if test="jyjcInspectionApplicationModel.inspectionChargePerson != null and jyjcInspectionApplicationModel.inspectionChargePerson != ''">
-                and tzjia.inspection_charge_person like concat('%',#{jyjcInspectionApplicationModel.inspectionChargePerson},'%')
-            </if>
-            <if test="jyjcInspectionApplicationModel.inspectionChargePersonName != null and jyjcInspectionApplicationModel.inspectionChargePersonName != ''">
-                and tzjia.inspection_charge_person_name like concat('%',#{jyjcInspectionApplicationModel.inspectionChargePersonName},'%')
-            </if>
             <if test="jyjcInspectionApplicationModel.status != null and jyjcInspectionApplicationModel.status != ''">
-                and tzjia.status = #{jyjcInspectionApplicationModel.status}
+                and (
+                <choose>
+                    <when test="statusList.contains(jyjcInspectionApplicationModel.status)">
+                        tzjia.status = #{jyjcInspectionApplicationModel.status}
+                    </when>
+                    <when test='jyjcInspectionApplicationModel.status == "66190"'>
+                        (tzjia.inspection_charge_person is null and tzjia.status = '6616')
+                    </when>
+                    <when test='jyjcInspectionApplicationModel.status == "66191"'>
+                        (tzjia.inspection_charge_person <![CDATA[<>]]>  '' and tzjia.plan_inspection_date is null  and tzjia.status = '6616')
+                    </when>
+                    <when test='jyjcInspectionApplicationModel.status == "66192"'>
+                        (tzjia.plan_inspection_date is not null  and tzjia.status = '6616')
+                    </when>
+                    <otherwise>
+                        1=1
+                    </otherwise>
+                </choose>
+
+
+
+                )
             </if>
             <if test="jyjcInspectionApplicationModel.bizType != null and jyjcInspectionApplicationModel.bizType != ''">
                 and tzjia.biz_type = #{jyjcInspectionApplicationModel.bizType}
@@ -136,13 +95,10 @@
                 and tzjia.application_unit_code = #{jyjcInspectionApplicationModel.applicationUnitCode}
             </if>
             <if test="identity == 'apply'">
-                and (tzjia.application_unit_code = #{currentApplicationUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                and (tzjia.application_unit_code = #{currentApplicationUnitCode} or tzjia.inspection_unit_code = #{currentApplicationUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ) or tzjia.inspection_charge_person = #{currentUserId})
             </if>
             <if test="identity == 'receive'">
-                and (tzjia.inspection_unit_code = #{currentInspectionUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
-            </if>
-            <if test="identity == 'all'">
-                and ((tzjia.application_unit_code = #{currentApplicationUnitCode} or tzjia.inspection_unit_code = #{currentInspectionUnitCode}) OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
+                and (tzjia.inspection_unit_code = #{currentInspectionUnitCode} OR tzjia.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )  or tzjia.inspection_charge_person = #{currentUserId})
             </if>
             <if test="orgCode != null and orgCode != ''">
                 AND tzjia.instance_id <![CDATA[<>]]>  ''

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/InspectionChargePersonController.java

+package com.yeejoin.amos.boot.module.jyjc.biz.controller;
+
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.InspectionChargePersonServiceImpl;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+
+/**
+ * 检验负责人控制期
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping(value = "/inspect-charge/person")
+@Api(tags = " 业务负责人")
+@RequiredArgsConstructor
+public class InspectionChargePersonController extends BaseController {
+
+    private final InspectionChargePersonServiceImpl chargePersonService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/{applicationSeq}/save")
+    @ApiOperation(httpMethod = "GET", value = "业务负责人安排保存", notes = "业务负责人安排保存")
+    public ResponseModel<JyjcInspectionApplicationModel> savePlanData(@PathVariable String applicationSeq,
+                                                                      @RequestBody JyjcInspectionApplicationModel model) {
+        return ResponseHelper.buildResponse(chargePersonService.saveChargePersonData(applicationSeq, model));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/user/list")
+    @ApiOperation(httpMethod = "GET", value = "业务负责人查询", notes = "业务负责人查询")
+    public ResponseModel<List<TzsUserInfo>> getUserList() {
+        return ResponseHelper.buildResponse(chargePersonService.getUserList(getSelectedOrgInfo().getCompany()));
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/InspectionPlanController.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.InspectionPlanModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.InspectionPlanServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -20,10 +21,10 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 @RestController
 @RequestMapping(value = "/inspection/plan")
 @Api(tags = "计划排期")
+@RequiredArgsConstructor
 public class InspectionPlanController {
 
-    @Autowired
-    InspectionPlanServiceImpl inspectionPlanService;
+    private final InspectionPlanServiceImpl inspectionPlanService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/{applicationSeq}/save")
@@ -39,4 +40,6 @@ public class InspectionPlanController {
     public ResponseModel<JSONObject> savePlanData(@PathVariable String applicationSeq) {
         return ResponseHelper.buildResponse(inspectionPlanService.getDetail(applicationSeq));
     }
+
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/TaskModelServiceImpl.java

@@ -289,7 +289,6 @@ public class TaskModelServiceImpl {
         obj.remove("applicationRemark");
         obj.remove("planData");
         obj.remove("inspectionChargePerson");
-        obj.remove("inspectionChargePersonName");
         obj.remove("inspectionChargePhone");
         obj.remove("recUserId");
         obj.remove("recDate");

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,9 +15,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
-import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionHistory;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
@@ -26,7 +23,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.enums.OpenBizTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.PersonTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.InstanceRuntimeData;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
@@ -40,7 +36,6 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.eclipse.paho.client.mqttv3.MqttException;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +45,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -391,9 +385,6 @@ public class CommonServiceImpl {
         if (!isApplyIdentityMatch && isReceiveIdentityMatch) {
             return "receive";
         }
-        if (isApplyIdentityMatch) {
-            return "all";
-        }
         return "no";
     }
 
@@ -461,4 +452,17 @@ public class CommonServiceImpl {
         List<TzsUserInfo> userInfos = this.getUserInfosByUnitCode(model.getInspectionUnitCode());
         return userInfos.stream().filter(u -> model.getInspector().contains(u.getSequenceNbr() + "")).map(TzsUserInfo::getName).collect(Collectors.joining(","));
     }
+
+    /**
+     * 兼容个人类型6600_
+     *
+     * @param company 身份
+     * @return 不带证件类型的公司code
+     */
+    public static String getUnitCode(CompanyBo company) {
+        String unitCode;
+        unitCode = company.getCompanyCode();
+        unitCode = unitCode.contains("_") ? unitCode.substring(unitCode.indexOf("_") + 1) : unitCode;
+        return unitCode;
+    }
 }

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

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
+import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Service
+@RequiredArgsConstructor
+public class InspectionChargePersonServiceImpl {
+
+    private final JyjcInspectionApplicationServiceImpl inspectionApplicationService;
+
+    private final TzsUserInfoMapper userInfoMapper;
+
+    public JyjcInspectionApplicationModel saveChargePersonData(String applicationSeq, JyjcInspectionApplicationModel model) {
+        LambdaUpdateWrapper<JyjcInspectionApplication> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(JyjcInspectionApplication::getInspectionChargePerson, model.getInspectionChargePerson());
+        updateWrapper.set(JyjcInspectionApplication::getRemark2, model.getRemark2());
+        updateWrapper.eq(BaseEntity::getSequenceNbr, applicationSeq);
+        inspectionApplicationService.update(updateWrapper);
+        return model;
+    }
+
+    public List<TzsUserInfo> getUserList(CompanyBo company) {
+        LambdaQueryWrapper<TzsUserInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TzsUserInfo::getUnitCode, company.getCompanyCode());
+        queryWrapper.eq(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getIsDelete, false);
+        // 业务负责人 待实现
+        // queryWrapper.like(TzsUserInfo::getNewPost, "6767");
+        queryWrapper.isNotNull(TzsUserInfo::getAmosUserId);
+        queryWrapper.select(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getSequenceNbr, TzsUserInfo::getAmosUserId, TzsUserInfo::getName);
+        return userInfoMapper.selectList(queryWrapper);
+    }
+}

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -11,6 +12,8 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.InspectionPlanModel;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -45,6 +48,7 @@ public class InspectionPlanServiceImpl {
         updateWrapper.set(JyjcInspectionApplication::getPlanData, JSONObject.toJSONString(model));
         updateWrapper.eq(BaseEntity::getSequenceNbr, applicationSeq);
         updateWrapper.set(JyjcInspectionApplication::getPlanCreateDate, new Date());
+        updateWrapper.set(JyjcInspectionApplication::getPlanInspectionDate, model.getPlanInspectionDate());
         inspectionApplicationService.update(updateWrapper);
         // 异步写入计划排期日期，统计办理时效使用
         this.updatePlanCreateDate(applicationSeq);

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

@@ -499,14 +499,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         SortVo sortMap = commonService.sortFieldConversion(sort);
         String companyType = reginParams.getCompany().getCompanyType();
-        String companyCode = reginParams.getCompany().getCompanyCode();
+        String companyCode = CommonServiceImpl.getUnitCode(reginParams.getCompany());
         String currentUserId = reginParams.getUserModel().getUserId();
         String currentApplicationUnitCode = null;
         String currentInspectionUnitCode = null;
         if (ValidationUtil.isEmpty(companyType)) {
             return new Page<>(0, 10, 0);
         }
-        // 判断当前登录人身份（报检机构、接收机构、即时报检又是接收机构、都不是（不存在此情况））
+        // 判断当前登录人身份（报检机构、接收机构)
         String identity = CommonServiceImpl.getCompanyIdentityByType(reginParams.getCompany().getCompanyType());
         if (ValidationUtil.equals("apply", identity)) {
             currentApplicationUnitCode = companyCode;
@@ -514,12 +514,30 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         if (ValidationUtil.equals("receive", identity)) {
             currentInspectionUnitCode = companyCode;
         }
-        if (ValidationUtil.equals("all", identity)) {
-            currentApplicationUnitCode = companyCode;
-            currentInspectionUnitCode = companyCode;
-        }
         String orgCode = "jgLook".equals(client) ? reginParams.getCompany().getOrgCode() : null;
-        return this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode, currentUserId, sortMap, orgCode);
+        Page<JyjcInspectionApplicationModel> result = this.getBaseMapper().selectForPage(page, model, identity, currentApplicationUnitCode, currentInspectionUnitCode, currentUserId, sortMap, orgCode);
+        result.getRecords().forEach(r -> {
+            r.setLoginPersonCompanyCode(companyCode);
+            this.addPlanAndConfirmStatus(r, model);
+        });
+        return result;
+    }
+
+    private void addPlanAndConfirmStatus(JyjcInspectionApplicationModel r, JyjcInspectionApplicationModel filter) {
+        // 全部时，设置计划状态
+        if (String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(r.getStatus()) && StringUtils.isEmpty(filter.getStatus())) {
+            if (StringUtils.isEmpty(r.getInspectionChargePerson())) {
+                r.setStatusName(InspectPlanStatusEnum.JS_DFP.getName());
+            } else if (StringUtils.isNotEmpty(r.getInspectionChargePerson()) && r.getPlanInspectionDate() == null) {
+                r.setStatusName(InspectPlanStatusEnum.JS_YFP_DQR.getName());
+            } else {
+                r.setStatusName(InspectPlanStatusEnum.JS_YFP_YQR.getName());
+            }
+        }
+        // 进行筛选时，返回筛选的状态
+        if (String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(r.getStatus()) && StringUtils.isNotEmpty(filter.getStatus())) {
+            r.setStatusName(InspectPlanStatusEnum.getByValue(filter.getStatus()).getName());
+        }
     }
 
     /**

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

@@ -459,7 +459,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         String level = reginParams.getCompany().getLevel();
         if (BaseController.COMPANY_TYPE_COMPANY.equals(level)) {
             dto.setType("enterprise");
-            dto.setUnitCode(getUnitCode(reginParams.getCompany()));
+            dto.setUnitCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()));
         } else {
             dto.setType("supervision");
         }
@@ -534,7 +534,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         } else {
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
             jyjcOpeningApplicationModel.setOpenBizType(this.getOpenBizTypeByIdentity(company.getCompanyType()));
-            unitCode = getUnitCode(company);
+            unitCode = CommonServiceImpl.getUnitCode(company);
             jyjcOpeningApplicationModel.setUnitCodeName(company.getCompanyName());
             jyjcOpeningApplicationModel.setUnitCode(unitCode);
             // 证书资质信息
@@ -546,18 +546,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return jyjcOpeningApplicationModel;
     }
 
-    /**
-     * 兼容个人类型6600_
-     *
-     * @param company 身份
-     * @return 不带证件类型的公司code
-     */
-    private static String getUnitCode(CompanyBo company) {
-        String unitCode;
-        unitCode = company.getCompanyCode();
-        unitCode = unitCode.contains("_") ? unitCode.substring(unitCode.indexOf("_") + 1) : unitCode;
-        return unitCode;
-    }
+
 
     private String getOpenBizTypeByIdentity(String unitType) {
         OpenBizTypeEnumV2 bizTypeEnumV2 = OpenBizTypeEnumV2.getOneByUnitType(unitType);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JYJCStatisticsMapper.xml

@@ -72,12 +72,6 @@
 			<if test="dto.acceptDate != null">
 				and tzjia.accept_date = #{dto.acceptDate}
 			</if>
-			<if test="dto.inspectionChargePerson != null and dto.inspectionChargePerson != ''">
-				and tzjia.inspection_charge_person like concat('%',#{dto.inspectionChargePerson},'%')
-			</if>
-			<if test="dto.inspectionChargePersonName != null and dto.inspectionChargePersonName != ''">
-				and tzjia.inspection_charge_person_name like concat('%',#{dto.inspectionChargePersonName},'%')
-			</if>
 			<if test="dto.status != null and dto.status != ''">
 				and tzjia.status = #{dto.status}
 			</if>