Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -110,7 +111,6 @@ public class JgChangeRegistrationReformDto extends BaseDto {
     @ApiModelProperty(value = "任务发起人id")
     private String promoter;
 
-
     private List<String> roleIds;
 
     private String dataType;

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

@@ -203,4 +203,7 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "状态")
     private String status;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecuteIds;
 }

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

@@ -202,4 +202,17 @@ public class JgChangeRegistrationReform extends BaseEntity {
     @TableField(value = "promoter")
     private String promoter;
 
+    /**
+     * 改造质量证明材料
+     */
+    @TableField(value = "transformation_quality_certificate")
+    private String transformationQualityCertificate;
+
+
+    /**
+     *改造监督检验证书
+     */
+    @TableField(value = "renovation_supervisioninspection_certificate")
+    private String renovationSupervisioninspectionCertificate;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/MaintenceStatusEnum.java

@@ -10,8 +10,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum MaintenceStatusEnum {
 
-    SUBMIT("使用单位提交", "submit", "使用单位待提交", "维保单位已驳回", "使用单位撤回"),
-    RECEIVE("维保单位审核确认", "receive", "维保单位待受理", "监管单位已驳回", "维保单位撤回"),
+    SUBMIT("使用单位提交", "submit", "使用单位待提交", "维保单位已驳回", "使用单位已撤回"),
+    RECEIVE("维保单位审核确认", "receive", "维保单位待受理", "监管单位已驳回", "维保单位已撤回"),
     PRELIMINARY("监管单位审核", "preliminary", "监管单位待受理", "", "");
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/UseStatusEnum.java

@@ -3,9 +3,6 @@ package com.yeejoin.amos.boot.module.jg.api.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 使用登记状态西悉尼
  */

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/WorkFlowStatusEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 使用登记状态西悉尼
+ */
+@Getter
+@AllArgsConstructor
+public enum WorkFlowStatusEnum {
+
+    /**
+     * 使用登记流程
+     */
+    USE_SUBMIT("使用单位提交", "useSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    USE_RECEIVE("一级受理", "useReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    USE_PRELIMINARY("二级受理", "usePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    USE_REEXAMINE("三级受理", "useReexamine", "三级待受理","",""),
+
+
+    /**
+     * 维保流程
+     */
+    MAIN_SUBMIT("使用单位提交", "mainSubmit", "使用单位待提交", "维保单位已驳回", "使用单位撤回"),
+    MAIN_RECEIVE("维保单位审核确认", "mainReceive", "维保单位待受理", "监管单位已驳回", "维保单位撤回"),
+    MAIN_PRELIMINARY("监管单位审核", "mainPreliminary", "监管单位待受理", "", ""),
+
+
+    /**
+     * 电梯注销
+     */
+    CANCEL_SUBMIT("使用单位提交", "cancelSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    CANCEL_RECEIVE("一级受理", "cancelReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    CANCEL_PRELIMINARY("二级受理", "cancelPreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    CANCEL_REEXAMINE("三级受理", "cancelReexamine", "三级待受理", "", ""),
+
+    /**
+     * 改造登记流程
+     */
+    CHANGE_SUBMIT("使用单位提交", "changeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    CHANGE_RECEIVE("一级受理", "changeReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    CHANGE_PRELIMINARY("二级受理", "changePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    CHANGE_REEXAMINE("三级受理", "changeReexamine", "三级待受理", "", "");
+
+
+    private final String name;
+
+    private final String code;
+
+    private final String pass;
+
+    private final String reject;
+
+    private final String rollBack;
+
+
+
+    public static WorkFlowStatusEnum getMessage(String code){
+        for (WorkFlowStatusEnum constants : values()) {
+            if (constants.getCode().equals(code)) {
+                return constants;
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/WorkFlowFeignService.java

@@ -2,15 +2,10 @@ package com.yeejoin.amos.boot.module.jg.flc.api.fegin;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
-import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Map;
 

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

@@ -27,7 +27,7 @@
     </select>
     <select id="getUserInfo" resultType="java.util.Map">
         SELECT
-            *
+            phone
         FROM
             "tzs_user_info"
         WHERE

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

@@ -2,39 +2,13 @@
 <!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.jg.api.mapper.JgMaintainNoticeMapper">
     <update id="updatePromoter">
-        UPDATE tzs_jg_maintain_notice set promoter = null
+        UPDATE tzs_jg_maintain_notice
+        set promoter = null
         where sequence_nbr = #{id}
     </update>
 
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice">
-        select
-        isn.sequence_nbr AS sequenceNbr,
-        isn.apply_no AS applyNo,
-        isn.notice_date AS noticeDate,
-        isn.use_unit_name AS useUnitName,
-        isn.receive_org_name AS receiveOrgName,
-        isn.address AS address,
-        isn.notice_status AS noticeStatus,
-        isn.install_unit_name AS installUnitName,
-        isn.province,
-        isn.city,
-        isn.county,
-        isn.factory_use_site_street,
-        isn.street_name,
-        isn.street,
-        isn.maintain_type,
-        isn.plan_date,
-        isn.notice_report_url,
-        isn.province_name AS provinceName,
-        isn.city_name AS cityName,
-        isn.county_name AS countyName,
-        isn.promoter,
-        isn.equ_category AS equCategory,
-        isn.equ_list_code AS equListCode,
-        isn.instance_id AS instanceId,
-        isn.accept_date AS acceptDate
-        FROM
-        tzs_jg_maintain_notice isn
+        select isn.* FROM tzs_jg_maintain_notice isn
         <where>
             isn.is_delete = 0
             <if test="param != null ">
@@ -70,80 +44,75 @@
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
-        select
-            isn.sequence_nbr AS sequenceNbr,
-            isn.apply_no AS applyNo,
-            isn.notice_date AS noticeDate,
-            isn.use_unit_name AS useUnitName,
-            isn.receive_org_name AS receiveOrgName,
-            isn.address AS address,
-            isn.notice_status AS noticeStatus,
-            isn.install_unit_name AS installUnitName,
-            isn.province,
-            isn.city,
-            isn.county,
-            isn.factory_use_site_street AS factoryUseSiteStreet,
-            isn.street_name AS streetName,
-            isn.street,
-            isn.maintain_type AS maintainType,
-            isn.notice_report_url AS noticeReportUrl,
-            isn.province_name AS provinceName,
-            isn.city_name AS cityName,
-            isn.county_name AS countyName,
-            isn.instance_id AS instanceId,
-            isn.promoter,
-            isn.equ_category AS equCategory,
-            isn.equ_list_code AS equListCode,
-            isn.plan_date AS installStartDate,
-            isn.construction_manager AS installLeaderName,
-            isn.construction_manager_phone AS installLeaderPhone,
-            ri.equ_list AS equList,
-            ri.equ_category AS equCategory,
-            ri.EQU_DEFINE AS equDefine,
-            ri.product_name AS productName,
-            ri.brand_name AS brandName,
-            ri.equ_type AS equType,
-            ri.equ_code AS equRegisterCode,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
-            di.design_unit_credit_code AS designUnitCreditCode,
-            di.design_unit_name AS designUnitName,
-            di.design_license_num AS designLicenseNum,
-            di.design_use_date AS designUseDate,
-            di.design_date AS designDate,
-            di.drawing_do AS drawingDo,
-            di.appraisal_unit AS appraisalUnit,
-            di.appraisal_date AS appraisalDate,
-            di.design_doc AS designDoc,
-            di.design_standard AS designStandard,
-            fi.produce_unit_credit_code AS produceUnitCreditCode,
-            fi.produce_unit_name AS produceUnitName,
-            fi.produce_license_num AS produceLicenseNum,
-            fi.FACTORY_NUM AS produceCode,
-            fi.FACTORY_NUM AS factoryNum,
-            fi.produce_date AS produceDate,
-            fi.imported AS imported,
-            fi.produce_country AS produceCountry,
-            fi.factory_standard AS factoryStandard,
-            fi.product_quality_yield_prove AS productQualityYieldProve,
-            fi.ins_use_maintain_explain AS insUseMaintainExplain,
-            ui.safety_manager AS safetyManager,
-            ei.legal_person AS safetyManager,
-            ei.legal_phone AS safetyManagerPhone,
-            ui.CITY_NAME AS useUnitCityName,
-            ui.COUNTY_NAME AS useUnitCountyName,
-            ei.ADDRESS AS useUnitAddress
-        FROM
-            tzs_jg_maintain_notice isn
-                LEFT JOIN tzs_jg_maintain_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
-                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
-                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
-                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
-                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
-                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
-                LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
-        WHERE
-            isn.sequence_nbr = #{sequenceNbr}
-            LIMIT 1
+        select isn.sequence_nbr               AS sequenceNbr,
+               isn.apply_no                   AS applyNo,
+               isn.notice_date                AS noticeDate,
+               isn.use_unit_name              AS useUnitName,
+               isn.receive_org_name           AS receiveOrgName,
+               isn.address                    AS address,
+               isn.notice_status              AS noticeStatus,
+               isn.install_unit_name          AS installUnitName,
+               isn.province,
+               isn.city,
+               isn.county,
+               isn.factory_use_site_street    AS factoryUseSiteStreet,
+               isn.street_name                AS streetName,
+               isn.street,
+               isn.maintain_type              AS maintainType,
+               isn.notice_report_url          AS noticeReportUrl,
+               isn.province_name              AS provinceName,
+               isn.city_name                  AS cityName,
+               isn.county_name                AS countyName,
+               isn.instance_id                AS instanceId,
+               isn.promoter,
+               isn.equ_list_code              AS equListCode,
+               isn.plan_date                  AS installStartDate,
+               isn.construction_manager       AS installLeaderName,
+               isn.construction_manager_phone AS installLeaderPhone,
+               ri.equ_list                    AS equList,
+               ri.equ_category                AS equCategory,
+               ri.EQU_DEFINE                  AS equDefine,
+               ri.product_name                AS productName,
+               ri.brand_name                  AS brandName,
+               ri.equ_type                    AS equType,
+               ri.equ_code                    AS equRegisterCode,
+               ri.equ_price                   AS equPrice,
+               ri.product_photo               AS productPhoto,
+               di.design_unit_credit_code     AS designUnitCreditCode,
+               di.design_unit_name            AS designUnitName,
+               di.design_license_num          AS designLicenseNum,
+               di.design_use_date             AS designUseDate,
+               di.design_date                 AS designDate,
+               di.drawing_do                  AS drawingDo,
+               di.appraisal_unit              AS appraisalUnit,
+               di.appraisal_date              AS appraisalDate,
+               di.design_doc                  AS designDoc,
+               di.design_standard             AS designStandard,
+               fi.produce_unit_credit_code    AS produceUnitCreditCode,
+               fi.produce_unit_name           AS produceUnitName,
+               fi.produce_license_num         AS produceLicenseNum,
+               fi.FACTORY_NUM                 AS produceCode,
+               fi.FACTORY_NUM                 AS factoryNum,
+               fi.produce_date                AS produceDate,
+               fi.imported                    AS imported,
+               fi.produce_country             AS produceCountry,
+               fi.factory_standard            AS factoryStandard,
+               fi.product_quality_yield_prove AS productQualityYieldProve,
+               fi.ins_use_maintain_explain    AS insUseMaintainExplain,
+               ui.safety_manager              AS safetyManager,
+               ei.legal_person                AS safetyManager,
+               ei.legal_phone                 AS safetyManagerPhone,
+               ui.CITY_NAME                   AS useUnitCityName,
+               ui.COUNTY_NAME                 AS useUnitCountyName,
+               ei.ADDRESS                     AS useUnitAddress
+        FROM tzs_jg_maintain_notice isn
+                 LEFT JOIN tzs_jg_maintain_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
+                 LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+                 LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+                 LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+                 LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
+        WHERE isn.sequence_nbr = #{sequenceNbr} LIMIT 1
     </select>
 </mapper>

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

@@ -128,7 +128,9 @@
         rec_date,
         create_user_id,
         create_date,
-        instance_id
+        instance_id,
+        promoter,
+        next_execute_ids
         FROM
         amos_tzs_biz.tzs_jg_maintenance_contract
         <where>
@@ -155,7 +157,7 @@
                 and receive_org_code = #{contractDto.receiveOrgCode}
             </if>
             <if test="contractDto.roleIds != null">
-                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                <foreach collection='contractDto.roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
                 </foreach>
             </if>

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

@@ -64,7 +64,7 @@
             </if>
         </where>
         ORDER BY
-        isn.rec_date DESC
+        isn.apply_no DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -7,7 +7,9 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import javafx.scene.chart.ValueAxis;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -85,8 +87,9 @@ public class CommonController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getSecurityAdmin")
 	@ApiOperation(httpMethod = "GET", value = "查找当前公司下所属的安全管理员", notes = "查找当前公司下所属的安全管理员")
-	public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type) {
-		return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type));
+	public ResponseModel<List<Map<String, Object>>> getSecurityAdmin(@RequestParam(value = "type") String type,
+																	@RequestParam(value = "useUnitCode",required = false)String useUnitCode) {
+		return ResponseHelper.buildResponse(commonService.getSecurityAdmin(type,useUnitCode));
 	}
 
 
@@ -96,8 +99,8 @@ public class CommonController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/getUserInfo")
-	@ApiOperation(httpMethod = "GET", value = "查询安全管理员的基本信息", notes = "查询安全管理员的基本信息")
+	@GetMapping(value = "/getUserPhone")
+	@ApiOperation(httpMethod = "GET", value = "查询用户对应联系方式", notes = "查询用户对应联系方式")
 	public ResponseModel<Map<String,Object>> getUserInfo(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
 		return ResponseHelper.buildResponse(commonService.getUserInfo(sequenceNbr));
 	}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java

@@ -55,7 +55,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 	@PostMapping(value = "/flowExecute")
 	@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
 	public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
-		jgChangeRegistrationReformServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+		jgChangeRegistrationReformServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")));
 		return ResponseHelper.buildResponse("ok");
 	}
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -114,8 +114,8 @@ public class JgChangeRegistrationReformController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
 	@GetMapping(value = "/getDetail")
-	public ResponseModel<Map<String, Object>> getDetail(@RequestParam("id") String id) {
-		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(id));
+	public ResponseModel<Map<String, Object>> getDetail(@RequestParam("currentDocumentId") String currentDocumentId,@RequestParam("equipId") String equipId) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId,equipId));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintenanceContractController.java

@@ -208,12 +208,13 @@ public class JgMaintenanceContractController extends BaseController {
     public ResponseModel<Page<JgMaintenanceContractVo>> queryForPage(@RequestParam(value = "current") int current,
                                                                       @RequestParam(value = "size") int size,
                                                                       @RequestParam(value = "phase") int phase,
+                                                                      Map<String,Object> map,
                                                                       JgMaintenanceContractDto maintenanceContractDto) {
         Page<JgMaintenanceContract> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         ReginParams reginParams = getSelectedOrgInfo();
-        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, phase, maintenanceContractDto, reginParams);
+        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, phase, map, reginParams);
         return ResponseHelper.buildResponse(contractDtoPage);
     }
 

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

@@ -25,7 +25,7 @@ public interface ICommonService {
 
     List<Map<String,Object>> getUnitListByType(String type);
 
-    List<Map<String,Object>> getSecurityAdmin(String type);
+    List<Map<String, Object>> getSecurityAdmin(String type, String useUnitCode);
 
     Map<String,Object> getUserInfo(String sequenceNbr);
 

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

@@ -171,10 +171,12 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public List<Map<String, Object>> getSecurityAdmin(String type) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        CompanyBo company = reginParams.getCompany();
-        String companyCode = company.getCompanyCode();
+    public List<Map<String, Object>> getSecurityAdmin(String type, String companyCode) {
+        if (ObjectUtils.isEmpty(companyCode)) {
+            ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            CompanyBo company = reginParams.getCompany();
+            companyCode = company.getCompanyCode();
+        }
         String postName = null;
         if (type.equals("use")) {
             postName = "安全管理员";
@@ -185,6 +187,9 @@ public class CommonServiceImpl implements ICommonService {
         if (type.equals("agw")) {
             postName = "安改维负责人";
         }
+        if (type.equals("wbry")) {
+            postName = "维保人员";
+        }
         return ObjectUtils.isEmpty(postName) ? new ArrayList<>() : commonMapper.getSecurityAdmin(companyCode, postName);
     }
 

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

@@ -140,9 +140,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         if (!ValidationUtil.isEmpty(notice.getStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
             maintainInfo.put("street", notice.getStreet() + "_" + notice.getStreetName());
         }
-        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
+        String[] fields = {"productPhoto",  "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
                 "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
-        // 设备信息
+        // 设备信息 "equCategory",  "equDefine",  "equRegisterCode",  "produceCountry",  "produceLicenseNum",
         List<Map<String, Object>> equipmentInfos = jgMaintainNoticeMapper.queryEquipInformation(sequenceNbr);
         for (String s : fields) {
             if (maintainInfo.containsKey(s))
@@ -242,7 +242,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             if (Objects.nonNull(notice.getMaintainType())) {
                 noticeDto.setMaintainTypeDesc(dictionaries.stream().filter(d -> notice.getMaintainType().equals(d.getCode())).map(DataDictionary::getName).collect(Collectors.joining()));
             }
-            noticeDto.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCityName() + notice.getStreetName() + notice.getAddress());
+            noticeDto.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCountyName() + notice.getStreetName() + notice.getAddress());
             return noticeDto;
         }).collect(java.util.stream.Collectors.toList());
         noticeDtoPage.setRecords(records);
@@ -464,6 +464,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
+            dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
+            dto.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(String.join(",", roleListSecond));
                 dto.setInstanceStatus(String.join(",", roleListFirst));
@@ -480,6 +482,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
+            dto.setCreateUserId(reginParams.getUserModel().getUserId());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -631,7 +634,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             jgInstallationNotice.setStatus(taskName[0]);
             jgInstallationNotice.setPromoter("");
             jgInstallationNotice.setNextExecuteIds(String.join(",", roleList));
-            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
             updateById(jgInstallationNotice);
         }
     }
@@ -667,6 +670,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     map.put("cityCode", jgMaintainNotice.getCity());
                     map.put("countyCode", jgMaintainNotice.getCounty());
                     map.put("equCategory", tzsJgRegistrationInfo.getEquCategory());
+                    jgMaintainNotice.setAcceptDate(new Date());
                     jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
                     jgMaintainNotice.setPromoter("");

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

@@ -41,6 +41,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.awt.print.Book;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -53,6 +54,7 @@ import java.util.stream.Collectors;
 @Service
 public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceContractDto, JgMaintenanceContract, JgMaintenanceContractMapper> implements IJgMaintenanceContractService {
 
+    public static final String SUBMIT_DATA = "0";
     public static final String SUBMIT_TYPE_FLOW = "1";
     public static final String WB_PROCESS_DEFINITION_KEY = "maintenanceFiling";
     private static final String HANDLING_STATUS_DICTIONARY = "JGGZZZ";
@@ -79,8 +81,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page,
                                                       int phase,
-                                                      JgMaintenanceContractDto dto,
+//                                                      JgMaintenanceContractDto dto,
+                                                      Map<String,Object> map,
                                                       ReginParams reginParams) {
+//        JgMaintenanceContractDto dto = new JgMaintenanceContractDto();
+//        JgMaintenanceContractDto dto = (JgMaintenanceContractDto)map;
+        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(map.get("jgMaintenanceContractDto")), JgMaintenanceContractDto.class);
+
         Page<JgMaintenanceContractDto> contractList = new Page<>();
         Page<JgMaintenanceContractVo> result = new Page<>();
         CompanyBo company = reginParams.getCompany();
@@ -374,6 +381,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
 
         // 新增编辑
         if ("add".equals(String.valueOf(map.get("pageType")))) {
+            contract.setStatus(SUBMIT_DATA.equals(submit) ? MaintenceStatusEnum.SUBMIT.getPass() : MaintenceStatusEnum.RECEIVE.getPass());
             this.save(contract);
         } else {
             this.getBaseMapper().updateById(contract);
@@ -414,7 +422,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     public void updateExecuteIds(String instanceId, Long sequenceNbr, String operate){
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String role = "";
-        String taskName = "流程结束";
+        String taskName = FlowStatusEnum.TO_BE_FINISHED.getName();
         ArrayList<String> roleList = new ArrayList<>();
         JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(sequenceNbr);
         try {
@@ -435,7 +443,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (!"流程结束".equals(taskName)){
+        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskName)){
             role= String.join(",", roleList);
             jgMaintenanceContract.setNextExecuteIds(role);
             jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());

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

@@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
@@ -37,6 +37,7 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -46,22 +47,13 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -139,7 +131,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         installationInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
         installationInfo.put("city", notice.getCity() + "_" + notice.getCityName());
         installationInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
-        installationInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCityName() + notice.getStreetName() + notice.getAddress());
+        installationInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCountyName() + notice.getStreetName() + notice.getAddress());
         installationInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
         // installationInfo.put("receiveOrgCreditCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
         installationInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
@@ -493,7 +485,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
             dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
-            dto.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));
+            dto.setEquListCode(String.valueOf(obj.get("EQU_DEFINE")));
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(String.join(",", roleListSecond));
                 dto.setInstanceStatus(String.join(",", roleListFirst));
@@ -502,6 +494,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            dto.setEntrustingUnitName(reginParams.getCompany().getCompanyName());
+            dto.setEntrustingUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
             jgRelationEquip.setEquipTransferId(applyNo);
             if (!CollectionUtils.isEmpty(instanceIdList)) {

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

@@ -239,111 +239,6 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
 
-//    public String flowExecute(Long id,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")));
-//            String taskId = taskMessage.getString("id");
-//            //组装信息
-//            TaskResultDTO dto = new TaskResultDTO();
-//            dto.setResultCode("approvalStatus");
-//            dto.setTaskId(taskId);
-//            dto.setComment(comment);
-//            HashMap<String, Object> map = new HashMap<>();
-//            map.put("approvalStatus", operate);
-//            dto.setVariable(map);
-//            //执行流程
-//            Workflow.taskClient.completeByTask(taskId, dto);
-//            // 查询下节点任务
-//            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
-//            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
-//                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-//                String nextTaskId = nextTask.getString("id");
-//                taskName = nextTask.getString("name");
-//                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-//                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-//                for (Object datum : data) {
-//                    if (((Map) datum).containsKey("groupId")) {
-//                        roleList.add(((Map) datum).get("groupId").toString());
-//                    }
-//                }
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        role= String.join(",", roleList);
-//        if (update) {
-//            Boolean rollBack = "1".equals(operate) ? true : false;
-//            updateStatus(id,instanceId, taskName, role, rollBack);
-//        }
-//        return role;
-//    }
-//
-//
-//    public void updateStatus(Long id , String instanceId, String taskName, String role, Boolean rollBack) {
-//        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-//        LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
-//        lambda.eq(JgScrapCancel::getSequenceNbr, id);
-//        JgScrapCancel jgScrapCancel = this.getBaseMapper().selectOne(lambda);
-//        if ("流程结束".equals(taskName)) {
-//            jgScrapCancel.setStatus(taskName);
-//            jgScrapCancel.setAuditStatus(CancelWorkFlowStatusEnum.COMPLETE.getName());
-//
-//
-//            LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
-//            lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, id);
-//            JgScrapCancelEq jgScrapCancelEq = jgScrapCancelEqMapper.selectOne(lambdaEq);
-//
-//            ResponseModel<String> responseModel = tzsServiceFeignClient.useRegistrationCode(idxBizJgOtherInfoMapper.getSupervisoryCodeByEquipmentCode(jgScrapCancelEq.getEquId()));
-//            String newUseRegistrationCertificateNumber=responseModel.getResult().split("-")[0];
-//
-//            Map<String,Map<String,Object>> resultMap = new HashMap<>();
-//            Map<String,Object> map1 =new HashMap<>();
-//            map1.put("USE_ORG_CODE",newUseRegistrationCertificateNumber );
-//            if (CancelTypeEnum.SCRAPPED.getCode().equals(jgScrapCancel.getCancelType())) {
-//                IdxBizJgUseInfo idxBizJgUseInfo = new IdxBizJgUseInfo();
-//                idxBizJgUseInfo.setEquState(String.valueOf(EquimentEnum.BAOFEI.getCode()));
-//                LambdaQueryWrapper<IdxBizJgUseInfo> wrapper = new LambdaQueryWrapper<>();
-//                wrapper.eq(IdxBizJgUseInfo::getRecord, jgScrapCancelEq.getEquId());
-//                idxBizJgUseInfoMapper.update(idxBizJgUseInfo, wrapper);
-//                map1.put("EQU_STATE", String.valueOf(EquimentEnum.BAOFEI.getCode()));
-//            } else {
-//                SuperviseInfo superviseInfo = new SuperviseInfo();
-//                superviseInfo.setOrgBranchCode("");
-//                superviseInfo.setOrgBranchName("");
-//                LambdaQueryWrapper<SuperviseInfo> wrapper = new LambdaQueryWrapper<>();
-//                wrapper.eq(SuperviseInfo::getRecord, jgScrapCancelEq.getEquId());
-//                superviseInfoMapper.update(superviseInfo, wrapper);
-//                map1.put("ORG_BRANCH_CODE", "");
-//                map1.put("ORG_BRANCH_NAME", "");
-//            }
-//            resultMap.put(jgScrapCancelEq.getEquId(), map1);
-//            tzsServiceFeignClient.commonUpdateEsDataByIds(resultMap);
-//        } else {
-//            jgScrapCancel.setNextExecuteIds(role);
-//            jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
-//            if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
-//                jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + role);
-//            } else {
-//                jgScrapCancel.setInstanceStatus(role);
-//            }
-//        }
-//        CancelWorkFlowStatusEnum message = CancelWorkFlowStatusEnum.getMessage(taskName);
-//        assert message != null;
-//        if (rollBack){
-//            jgScrapCancel.setAuditStatus(message.getRollBack());
-//            this.getBaseMapper().update(jgScrapCancel, lambda);
-//            this.getBaseMapper().updatePromoter(jgScrapCancel.getSequenceNbr());
-//        }else {
-//            jgScrapCancel.setAuditStatus(message.getPass());
-//            this.getBaseMapper().update(jgScrapCancel, lambda);
-//        }
-//    }
-
-
     public void deleteBatch(List<Long> ids) {
         JgScrapCancel jgScrapCancel = new JgScrapCancel();
         jgScrapCancel.setIsDelete(true);

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

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,6 +20,7 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
 
 
    public 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);
+//   public 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, List<String> roleIds);
 
    Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
 

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

@@ -44,6 +44,6 @@ public class JyjcOpeningApplicationRequstDto {
     @ApiModelProperty (value = "申请时间")
     private String applyTime;
 
-
-
+    @ApiModelProperty (value = "supervision: 监管; enterprise: 企业")
+    private String type;
 }

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

@@ -47,7 +47,7 @@
             and inspection_unit_code in (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{inspectionUnitName},'%'))
         </if>
         <if test="inspectionUnitCode != null and inspectionUnitCode != ''">
-            and inspection_unit_code = #{inspectionUnitCode}
+            and inspection_unit_code = #{inspectionUnitCode} and status != '6610'
         </if>
         <if test="applicationUnitCode != null and applicationUnitCode != ''">
             and application_unit_code = #{applicationUnitCode}
@@ -73,6 +73,11 @@
         <if test="bizType != null and bizType != ''">
             and biz_type = #{bizType}
         </if>
+<!--        <if test="roleIds.size()>0">-->
+<!--            <foreach collection="roleIds" item="item" separator="or">-->
+<!--                and workflow_role like concat('%',#{item},'%')-->
+<!--            </foreach>-->
+<!--        </if>-->
         </where>
         order by tzjia.application_no desc
     </select>

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

@@ -48,6 +48,9 @@
             <if test="applyStartTime != '' and applyStartTime != null">
                 and apply_time &gt;=#{applyStartTime}
             </if>
+            <if test="jyjcOpeningApplicationRequstDto.type == 'supervision'">
+                and status not in ('6610')
+            </if>
         </where>
         order by sequence_nbr desc
 

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
@@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 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.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -50,8 +53,16 @@ public class JyjcInspectionApplicationController extends BaseController {
 
 		ReginParams selectedOrgInfo = getSelectedOrgInfo();
 		model.put("applicationUnitCode",selectedOrgInfo.getCompany().getCompanyCode());
+
+		if (model.get("operationType").toString().equals("2") || model.get("operationType").toString().equals("0")){
+
+			if(null == model.get("equip") ||model.getJSONArray("equip").size() < 1 ){
+					return CommonResponseUtil.failure("未选择报检设备时不可提交");
+			}
+
+		}
 		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.save(model));
-	}
+    }
 
 
 
@@ -133,14 +144,16 @@ public class JyjcInspectionApplicationController extends BaseController {
 											  @RequestParam(required = false) String applicationDate,
 											  @RequestParam(required = false) String acceptDate,
 											  @RequestParam(required = false) String inspectionChargePerson,
-											  @RequestParam(required = false) String status , String bizType) {
+											  @RequestParam(required = false) String status ,
+											 @RequestParam(required = false) String roles,	  String bizType) {
 	    Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 
 		ReginParams reginParams = getSelectedOrgInfo();
 		inspectionUnitCode = reginParams.getCompany().getCompanyCode();
-		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
+		List<String> roleIds = StrUtil.split(roles, ",");
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType ));
 	}
 
 
@@ -158,14 +171,18 @@ public class JyjcInspectionApplicationController extends BaseController {
 																				@RequestParam(required = false) String applicationDate,
 																				@RequestParam(required = false) String acceptDate,
 																				@RequestParam(required = false) String inspectionChargePerson,
-																				@RequestParam(required = false) String status , String bizType) {
+																					 @RequestParam(required = false) String roles,
+																					 @RequestParam(required = false) String status , String bizType) {
 		Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
 		page.setCurrent(current);
 		page.setSize(size);
 		ReginParams reginParams = getSelectedOrgInfo();
 		applicationUnitCode = reginParams.getCompany().getCompanyCode();
+			List<String> roleIds = StrUtil.split(roles, ",");
+//			return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType,roleIds));
 			return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,equipClassify,inspectionUnitCode,applicationUnitName,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
-		}
+
+	}
 
 			/**
              * 列表全部数据查询

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcOpeningApplicationServiceImpl;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -75,6 +76,9 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
 	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
+		if (ValidationUtil.isEmpty(model.getBaseUnitLicences()) || ValidationUtil.isEmpty(model.getUserInfos())) {
+			throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
+		}
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
 	}
 

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

@@ -104,10 +104,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         if (!model.getOperationType().equals("2")) {
             if (model.getOperationType().equals("0")) {
 
-                if(null == model.getEquip() ||model.getEquip().size() < 1 ){
-                    throw  new BadRequest("未选择报检设备时不可提交");
-                }
-
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey( model.getProcessKey());
                 dto.setBusinessKey(buildOrderNo());
@@ -134,7 +130,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
              model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
             } else if (model.getOperationType().equals("1")) {
-                model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
 
             LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getCode());
@@ -149,7 +144,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
             model.setApplicationNo(codes.get(0));
             model.setApplicationDate(new Date());
-
             model.setPromoter(reginParams.getUserModel().getUserId());
 
 
@@ -172,6 +166,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             // endregion
 
             if (null == model.getSequenceNbr()){
+                model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
                 model = this.createWithModel(model);
             }else {
                 model = this.updateWithModel(model);
@@ -297,9 +292,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                                                                                  String applicationDate,
                                                                                  String acceptDate,
                                                                                  String inspectionChargePerson,
-                                                                                 String status, String bizType) {
+                                                                                 String status, String bizType ) {
 
-        return this.getBaseMapper().queryForDataList(page, applicationNo, inspectionClassify, applicationUnitCode, applicationUnitName, equipClassify, inspectionUnitCode, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType);
+//        return this.getBaseMapper().queryForDataList(page, applicationNo, inspectionClassify, applicationUnitCode, applicationUnitName, equipClassify, inspectionUnitCode, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType,roleIds);
+        return this.getBaseMapper().queryForDataList(page, applicationNo, inspectionClassify, applicationUnitCode, applicationUnitName, equipClassify, inspectionUnitCode, inspectionUnitName, applicationDate, acceptDate, inspectionChargePerson, status, bizType );
 
     }
 
@@ -512,7 +508,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
        //此处自己撤销也赋予了办理日期 存在问题 与驳回 通过区分处理
         if (rollBack) {
             this.getBaseMapper().updatePromoter(entity.getSequenceNbr());
-        }else {
+        }
+        //逻辑变更为 通过后才对办理时间赋值
+        if (status.equals(FlowStatusEnum.TO_BE_FINISHED.getCode())){
             entity.setAcceptDate(new Date());
         }
         this.updateById(entity);

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -145,7 +146,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
                 model.setUnitCode(companyBo.getCompanyCode());
                 model.setUnitCodeName(companyBo.getCompanyName());
-                ResponseModel<Map<String, Object>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
+                // ResponseModel<Map<String, Object>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
                 List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
                 model.setApplicationSeq(codes.get(0));
                 model.setCreateUserId(reginParams.getUserModel().getUserId());
@@ -195,12 +196,46 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         }
         entity.setStatus(status);
         entity.setStatusName(FlowStatusEnum.getNameByType(Long.parseLong(status)));
+        // region 更新其他的数据为已作废
+        if (String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(status)) {
+            doDiscard(entity.getUnitCode(), entity.getSequenceNbr());
+            entity.setAcceptDate(new Date());
+        }
+        // endregion
         this.updateById(entity);
         if (rollBack) {
             this.getBaseMapper().updatePromoter(entity.getSequenceNbr());
         }
     }
 
+    /**
+     * 完成的时候废弃其他已完成的申请单
+     *
+     *
+     * @param unitCode unitCode
+     * @param sequenceNbr sequenceNbr
+     * @return {@link  Boolean}
+     * @author yangyang
+     * @throws
+     * @date 2023/12/22 09:23
+     */
+    public Boolean doDiscard(String unitCode, Long sequenceNbr) {
+        if (StringUtils.isBlank(unitCode) || sequenceNbr == null) {
+            return false;
+        }
+        List<Long> ids = this.lambdaQuery().select(JyjcOpeningApplication::getSequenceNbr)
+                             .eq(JyjcOpeningApplication::getUnitCode, unitCode)
+                             .eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getCode())
+                             .list().stream().filter(o -> o.getSequenceNbr().compareTo(sequenceNbr) != 0)
+                             .map(JyjcOpeningApplication::getSequenceNbr).collect(Collectors.toList());
+        if (ValidationUtil.isEmpty(ids)) {
+            return false;
+        }
+        UpdateWrapper<JyjcOpeningApplication> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("status", FlowStatusEnum.TO_BE_DISCARD.getCode()).set("status_name", FlowStatusEnum.TO_BE_DISCARD.getName()).in("SEQUENCE_NBR", ids);
+        return this.update(updateWrapper);
+    }
+
 
     /**
      * 分页查询
@@ -225,6 +260,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             applyStartTime = date + " 00:00:00";
             applyEndTime = date + " 23:59:59";
         }
+        // 设置为监管端
+        jyjcOpeningApplicationRequstDto.setType("supervision");
         return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationRequstDto, applyStartTime, applyEndTime);
     }
 
@@ -242,6 +279,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             applyStartTime = date + " 00:00:00";
             applyEndTime = date + " 23:59:59";
         }
+        jyjcOpeningApplicationRequstDto.setType("enterprise");
         return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationRequstDto, applyStartTime, applyEndTime);
     }
 
@@ -303,6 +341,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         // 获取检验人员信息
         QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
         userInfoQueryWrapper.eq("unit_code", unitCode);
+        userInfoQueryWrapper.eq("is_delete", true);
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         if (!ValidationUtil.isEmpty(userInfos)) {
             // List<String> codes = userInfos.stream()
@@ -419,9 +458,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                         jyjcOpeningApplication.setDetectionRegion(detectionRegion);
                     }
 //                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
-                    if(ObjectUtils.isEmpty(jyjcOpeningApplication.getAcceptDate())){
-                        jyjcOpeningApplication.setAcceptDate(new Date());
-                    }
+//                     if(ObjectUtils.isEmpty(jyjcOpeningApplication.getAcceptDate())){
+//                         jyjcOpeningApplication.setAcceptDate(new Date());
+//                     }
                     jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
                 }
                 role = (String) nextNodeInfo.get("role");

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterInfo> {
 
-    @Select("select use_org_code from idx_biz_jg_register_info where record = #{equipCode}")
+    @Select("select \"USE_ORG_CODE\" from idx_biz_jg_register_info where \"RECORD\" = #{equipCode}")
    String getUseOrgCodeByEquip(@Param("equipCode") String equipCode);
 
     @Select("update idx_biz_jg_register_info set \"USE_ORG_CODE\" = #{useOrgCode} where \"RECORD\" = #{equipCode}")