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/JgRegistrationHistoryDto.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;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-20
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgRegistrationHistoryDto", description="")
-public class JgRegistrationHistoryDto  extends BaseDto {
+@EqualsAndHashCode (callSuper = true)
+@ApiModel (value = "JgRegistrationHistoryDto", description = "")
+public class JgRegistrationHistoryDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "创建人ID")
+    @ApiModelProperty (value = "创建人ID")
     private String createUserId;
 
-    @ApiModelProperty(value = "创建时间")
+    @ApiModelProperty (value = "创建时间")
     private Date createDate;
 
-    @ApiModelProperty(value = "使用登记编号")
+    @ApiModelProperty (value = "使用登记编号")
     private String useRegistrationCode;
 
-    @ApiModelProperty(value = "登记类别(改造登记、移装登记)")
+    @ApiModelProperty (value = "登记类别(改造登记、移装登记)")
     private String registrationClass;
 
-    @ApiModelProperty(value = "变更数据")
+    @ApiModelProperty (value = "变更数据")
     private String changeData;
 
-    @ApiModelProperty(value = "设备监管码")
+    @ApiModelProperty (value = "设备监管码")
     private String supervisoryCode;
 
-    @ApiModelProperty(value = "设备id")
+    @ApiModelProperty (value = "设备id")
     private String equId;
 
-    @ApiModelProperty(value = "数据状态（新数据：new，历史数据：history）")
+    @ApiModelProperty (value = "数据状态（新数据：new，历史数据：history）")
     private String status;
 
-    @ApiModelProperty(value = "当前单据Id")
+    @ApiModelProperty (value = "当前单据Id")
     private String currentDocumentId;
 
-    @ApiModelProperty(value = "登记类型")
+    @ApiModelProperty (value = "登记类型")
     private String registrationType;
 
+    @ApiModelProperty (value = "原有数据")
+    private String oldData;
+
+
 }

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

@@ -100,4 +100,10 @@ public class JgScrapCancelDto extends BaseDto {
      */
     private String useUnitName;
 
+
+    /**
+     * 设备ID
+     */
+    private String record;
+
 }

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

 package com.yeejoin.amos.boot.module.jg.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -25,13 +26,13 @@ public class JgRegistrationHistory extends BaseEntity {
     /**
      * 创建人ID
      */
-	@TableField("create_user_id")
+	@TableField(value = "create_user_id", fill = FieldFill.INSERT_UPDATE)
     private String createUserId;
 
     /**
      * 创建时间
      */
-	@TableField("create_date")
+	@TableField(value = "create_date", fill = FieldFill.INSERT_UPDATE)
     private Date createDate;
 
     /**
@@ -82,4 +83,10 @@ public class JgRegistrationHistory extends BaseEntity {
 	@TableField("registration_type")
     private String registrationType;
 
+    /**
+     * 原有数据
+     */
+    @TableField("old_data")
+    private String oldData;
+
 }

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

@@ -3,6 +3,11 @@ package com.yeejoin.amos.boot.module.jg.api.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 使用登记状态西悉尼
  */
@@ -13,7 +18,7 @@ public enum WorkFlowStatusEnum {
     /**
      * 使用登记流程
      */
-    USE_SUBMIT("使用单位提交", "useSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    USE_SUBMIT("使用单位提交", "useSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
     USE_RECEIVE("一级受理", "useReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
     USE_PRELIMINARY("二级受理", "usePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
     USE_REEXAMINE("三级受理", "useReexamine", "三级待受理","",""),
@@ -22,15 +27,15 @@ public enum WorkFlowStatusEnum {
     /**
      * 维保流程
      */
-    MAIN_SUBMIT("使用单位提交", "mainSubmit", "使用单位待提交", "维保单位已驳回", "使用单位撤回"),
-    MAIN_RECEIVE("维保单位审核确认", "mainReceive", "维保单位待受理", "监管单位已驳回", "维保单位撤回"),
+    MAIN_SUBMIT("使用单位提交", "mainSubmit", "使用单位待提交", "维保单位已驳回", "使用单位已撤回"),
+    MAIN_RECEIVE("维保单位审核确认", "mainReceive", "维保单位待受理", "监管单位已驳回", "维保单位已撤回"),
     MAIN_PRELIMINARY("监管单位审核", "mainPreliminary", "监管单位待受理", "", ""),
 
 
     /**
      * 电梯注销
      */
-    CANCEL_SUBMIT("使用单位提交", "cancelSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    CANCEL_SUBMIT("使用单位提交", "cancelSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
     CANCEL_RECEIVE("一级受理", "cancelReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
     CANCEL_PRELIMINARY("二级受理", "cancelPreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
     CANCEL_REEXAMINE("三级受理", "cancelReexamine", "三级待受理", "", ""),
@@ -38,10 +43,18 @@ public enum WorkFlowStatusEnum {
     /**
      * 改造登记流程
      */
-    CHANGE_SUBMIT("使用单位提交", "changeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    CHANGE_SUBMIT("使用单位提交", "changeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
     CHANGE_RECEIVE("一级受理", "changeReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
     CHANGE_PRELIMINARY("二级受理", "changePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
-    CHANGE_REEXAMINE("三级受理", "changeReexamine", "三级待受理", "", "");
+    CHANGE_REEXAMINE("三级受理", "changeReexamine", "三级待受理", "", ""),
+
+    /**
+     * 移装变更登记流程
+     */
+    TRANSFER_SUBMIT("使用单位提交", "transferSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
+    TRANSFER_RECEIVE("一级受理", "transferReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    TRANSFER_PRELIMINARY("二级受理", "transferPreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    TRANSFER_REEXAMINE("三级受理", "transferReexamine", "三级待受理","","");
 
 
     private final String name;
@@ -64,4 +77,29 @@ public enum WorkFlowStatusEnum {
         }
         return null;
     }
+
+    public static List<Map<String, String>> getInfoList(String code) {
+        List<Map<String, String>> resultList = new ArrayList<>();
+        for (WorkFlowStatusEnum constants : values()) {
+            if (constants.getCode().startsWith(code)) {
+                HashMap<String, String> hashMap = new HashMap<>();
+                hashMap.put("name", constants.getPass());
+                hashMap.put("value", constants.getPass());
+                resultList.add(hashMap);
+                HashMap<String, String> hashMap1 = new HashMap<>();
+                hashMap1.put("name", constants.getReject());
+                hashMap1.put("value", constants.getReject());
+                resultList.add(hashMap1);
+                HashMap<String, String> hashMap2 = new HashMap<>();
+                hashMap2.put("name", constants.getRollBack());
+                hashMap2.put("value", constants.getRollBack());
+                resultList.add(hashMap2);
+            }
+        }
+        HashMap<String, String> hashMap = new HashMap<>();
+        hashMap.put("name", "已完成");
+        hashMap.put("value", "已完成");
+        resultList.add(hashMap);
+        return resultList;
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformEqMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReformEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 /**
@@ -14,4 +15,7 @@ import org.apache.ibatis.annotations.Update;
 public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> {
     @Update("update tzs_jg_change_registration_reform_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
+
+    @Select("select equ_id from tzs_jg_change_registration_reform_eq where   equip_transfer_id = #{currentDocumentId} ")
+    String selectEquipId(@Param("currentDocumentId") String currentDocumentId);
 }

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

@@ -10,16 +10,18 @@
     <select id="getListPage" resultType="java.util.Map">
         select ur.sequence_nbr as sequenceNbr,
         ur.audit_status as auditStatus,
-        ur.reg_date as regDate,
         ur.use_unit_name as useUnitName,
+        ur.use_registration_code as useRegistrationCode,
         ur.status,
         ur.receive_org_name as receiveOrgName,
+        DATE_FORMAT(ur.reg_date,'%Y-%m-%d') as regDate,
+        DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
         (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
         concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
-        ur.instance_id as instanceId,
+        ifnull(ur.instance_id, '') as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
         ifnull(ur.next_executor_ids,'') as nextExecutorIds,
@@ -49,7 +51,7 @@
                 </foreach>
             </if>
             <if test="dto.dataType == 'jg' ">
-                and  ur.receive_company_code = #{dto.unitCode}
+                and  ur.receive_org_code = #{dto.unitCode}
             </if>
             <if test="dto.dataType == 'company' ">
                 and  ur.use_unit_credit_code = #{dto.unitCode}

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

@@ -162,6 +162,7 @@
                 </foreach>
             </if>
         </where>
+        order by apply_no desc
     </select>
     <select id="queryBySequenceNbr"
             resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto">

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

@@ -12,8 +12,8 @@
         select ur.sequence_nbr as sequenceNbr,
         ur.instance_id as instanceId,
         ur.audit_status as auditStatus,
-        ur.rec_date as recDate,
-        ur.create_date as createDate,
+        DATE_FORMAT(ur.rec_date,'%Y-%m-%d') as recDate,
+        DATE_FORMAT(ur.create_date,'%Y-%m-%d') as createDate,
         ur.receive_org_code as receiveOrgCode,
         ur.receive_org_name as receiveOrgName,
         ur.receive_company_code as receiveCompanyCode,
@@ -25,7 +25,7 @@
         ur.instance_status as instanceStatus,
         ur.promoter,
         ifnull(ur.next_execute_ids,'') as nextExecuteIds,
-        audit_pass_date as auditPassDate,
+        DATE_FORMAT(ur.audit_pass_date,'%Y-%m-%d') as auditPassDate,
         use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
         ur.use_unit_name as useUnitName,
         ur.use_unit_code as useUnitCode,
@@ -35,7 +35,7 @@
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
         use.ADDRESS as address,
-        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
+        CONCAT(use.PROVINCE_NAME,'', use.CITY_NAME, '', use.COUNTY_NAME, '', use.street_name, use.ADDRESS, '') AS place,
         re.equ_id as equipId
         from tzs_jg_scrap_cancel ur
         LEFT JOIN tzs_jg_scrap_cancel_eq re  on ur.sequence_nbr = re.equip_transfer_id
@@ -49,13 +49,13 @@
             <if test="dto.auditStatus != null and dto.auditStatus != ''">
                 and ur.audit_status = #{dto.auditStatus}
             </if>
-<!--            <if test="dto.equCode != null and dto.equCode != ''">-->
-<!--                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')-->
-<!--            </if>-->
-<!--            <if test="dto.useUnitName != null and dto.useUnitName != ''">-->
-<!--                and  use.USE_UNIT_NAME like concat('%',#{dto.useUnitName},'%')-->
-<!--            </if>-->
-<!--             -->
+            <if test="dto.applyNo != null and dto.applyNo != ''">
+                and ur.apply_no like concat('%',#{dto.applyNo},'%')
+            </if>
+            <if test="dto.cancelType != null and dto.cancelType != ''">
+                and  ur.cancel_type = #{dto.cancelType}
+            </if>
+
             <if test="roleIds != null and dto.type == 'supervision'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     ur.instance_status like concat('%',#{role},'%')

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

@@ -10,7 +10,7 @@
     <select id="getListPage" resultType="java.util.Map">
         select ur.sequence_nbr as sequenceNbr,
         ur.audit_status as auditStatus,
-        ur.reg_date as regDate,
+        date_format(reg_date,'%Y-%m-%d') as regDate,
         ur.use_unit_name as useUnitName,
         ur.status,
         ur.receive_org_name as receiveOrgName,
@@ -23,7 +23,8 @@
         re.equ_id as equipId,
         ur.apply_no as applyNo,
        ur.next_execute_ids as nextExecuteIds,
-        ur.promoter
+        ur.promoter,
+        ur.supervisory_code  as supervisoryCode
         from tzs_jg_use_registration ur
         LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
         LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
@@ -58,7 +59,9 @@
             order by ur.rec_date desc
     </select>
     <select id="getDetail" resultType="java.util.Map">
-        SELECT jri.EQU_CODE                                                           as equCode,
+        SELECT
+            jri.RECORD as equipId,
+            jri.EQU_CODE                                                           as equCode,
 --                      (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
 --                      (SELECT name from tz_equipment_category where code = jri.EQU_LIST)     as equList,
 --                      (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)   as equDefine,
@@ -87,12 +90,13 @@
     </select>
     <select id="getInspectDetail" resultType="java.util.Map">
         SELECT INSPECT_TYPE       as inspectType,
-               INSPECT_STAFF      as inspctStaff,
+               INSPECT_STAFF      as inspectStaff,
                INSPECT_CONCLUSION as inspectConclusion,
                INSPECT_ORG_NAME   as inspectOrgName,
                INSPECT_DATE       as inspectDate,
                NEXT_INSPECT_DATE  as nextInspectDate,
-               INSPECT_REPORT     as inspectReport
+               INSPECT_REPORT     as inspectReport,
+               INSPECT_ORG_CODE     as inspectOrgCode
         from idx_biz_jg_inspection_detection_info
         where RECORD = #{id}
         ORDER BY INSPECT_DATE desc LIMIT 1

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

@@ -146,7 +146,7 @@ public class CommonController extends BaseController {
 	}
 
 	private Map<String, Object> mapPointTypeToMap(FlowStatusEnum e) {
-		if (FlowStatusEnum.TO_SUBMITTED.getCode() ==  e.getCode()) {
+		if (FlowStatusEnum.TO_SUBMITTED.getCode() ==  e.getCode() || FlowStatusEnum.TO_BE_DISCARD.getCode() == e.getCode()) {
 			return null;
 		}
 		Map<String, Object> record = new HashMap<>();

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

@@ -114,7 +114,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
 	@GetMapping(value = "/getDetail")
-	public ResponseModel<Map<String, Object>> getDetail(@RequestParam("currentDocumentId") String currentDocumentId,@RequestParam("equipId") String equipId) {
+	public ResponseModel<Map<String, Object>> getDetail(@RequestParam("currentDocumentId") String currentDocumentId,@RequestParam(value = "equipId",required = false) String equipId) {
 		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(currentDocumentId,equipId));
 	}
 

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
+import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgScrapCancelServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -96,7 +97,7 @@ public class JgScrapCancelController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
     @PostMapping(value = "/getList")
-    public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto,
+    public ResponseModel<Page<Map<String, Object>>> getList(@RequestBody JgScrapCancelDto dto,
                                                             @RequestParam(value = "current") int current,
                                                             @RequestParam(value = "size") int size) {
         Page<Map<String, Object>> page = new Page<>(current, size);
@@ -131,4 +132,12 @@ public class JgScrapCancelController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表筛选办理状态下拉", notes = "列表筛选办理状态下拉")
+    @GetMapping(value = "/getAuditStatusList")
+    public ResponseModel<List<Map<String, String>>> getAuditStatusList(@RequestParam(value = "code") String code) {
+        return ResponseHelper.buildResponse(WorkFlowStatusEnum.getInfoList(code));
+    }
+
+
 }

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

@@ -103,10 +103,10 @@ public class JgUseRegistrationController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "详情", notes = "详情")
     @GetMapping(value = "/getDetail")
-    public ResponseModel<Map<String, Object>> getDetail(@RequestParam("id") String id) {
-        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(id));
+    public ResponseModel<Map<String, Object>> getDetail(@RequestParam("record") String record, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(record, sequenceNbr));
     }
 
     @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/service/impl/JgMaintainNoticeServiceImpl.java

@@ -432,7 +432,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     TaskResultDTO dto = new TaskResultDTO();
                     dto.setResultCode("approvalStatus");
                     dto.setTaskId(taskId);
-                    dto.setComment("提交流程");
+//                    dto.setComment("提交流程");
                     HashMap<String, Object> map = new HashMap<>();
                     map.put("approvalStatus", "0");
                     dto.setVariable(map);
@@ -605,7 +605,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         TaskResultDTO dto = new TaskResultDTO();
         dto.setResultCode("approvalStatus");
         dto.setTaskId(taskId);
-        dto.setComment("提交流程");
+//        dto.setComment("提交流程");
         HashMap<String, Object> map = new HashMap<>();
         map.put("approvalStatus", op);
         dto.setVariable(map);

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

@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
@@ -315,7 +316,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Transactional
     public void revocation(String instanceId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String taskName = "";
+        String taskCode = "";
         JgMaintenanceContract jgMaintenanceContract = new JgMaintenanceContract();
         LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
         lambda.eq(JgMaintenanceContract::getInstanceId, instanceId);
@@ -324,9 +325,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             workFlowFeginService.rollBack(instanceId);
             JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
             JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
-            taskName = nextTask.getString("name");
+            taskCode = nextTask.getString("name");
             if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
                 String nextTaskId = nextTask.getString("id");
+                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
+                JSONObject result = nodeInfo.getResult();
+                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
+                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
                 AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
                 JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                 for (Object datum : data) {
@@ -338,9 +343,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (!ObjectUtils.isEmpty(taskName)) {
+        if (!ObjectUtils.isEmpty(taskCode)) {
 
-            jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getRollBack());
+            jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         }
         String join = String.join(",", roleList);
         jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
@@ -381,7 +386,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());
+            contract.setStatus(SUBMIT_DATA.equals(submit) ? WorkFlowStatusEnum.MAIN_SUBMIT.getPass() : WorkFlowStatusEnum.MAIN_RECEIVE.getPass());
             this.save(contract);
         } else {
             this.getBaseMapper().updateById(contract);
@@ -422,16 +427,20 @@ 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 = FlowStatusEnum.TO_BE_FINISHED.getName();
+        String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
         ArrayList<String> roleList = new ArrayList<>();
         JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(sequenceNbr);
         try {
             // 查询下节点任务
+
             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");
+                FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
+                JSONObject result = nodeInfo.getResult();
+                Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
+                taskCode = String.valueOf(taskInfo.get("taskDefinitionKey"));
                 AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
                 JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
                 for (Object datum : data) {
@@ -443,7 +452,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskName)){
+        if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)){
             role= String.join(",", roleList);
             jgMaintenanceContract.setNextExecuteIds(role);
             jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
@@ -455,15 +464,15 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             }
             if ("0".equals(operate)){
                 // 通过操作
-                jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getPass());
+                jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
             }else {
                 // 驳回操作
-                jgMaintenanceContract.setStatus(MaintenceStatusEnum.getMessage(taskName).getReject());
+                jgMaintenanceContract.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgMaintenanceContract.setPromoter(null);
             }
 
         }else {
-            jgMaintenanceContract.setStatus(taskName);
+            jgMaintenanceContract.setStatus(taskCode);
         }
         this.getBaseMapper().updateById(jgMaintenanceContract);
 

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

@@ -452,7 +452,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     TaskResultDTO dto = new TaskResultDTO();
                     dto.setResultCode("approvalStatus");
                     dto.setTaskId(taskId);
-                    dto.setComment("提交流程");
+                    dto.setComment("");
                     HashMap<String, Object> map = new HashMap<>();
                     map.put("approvalStatus", "0");
                     dto.setVariable(map);

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

@@ -42,10 +42,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 服务实现类
@@ -97,6 +94,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
         inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("equipId"));
         // 更新检验检测信息
+        inspectionDetectionInfo.setInspectReport(null);
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
         // 使用登记信息
         JgUseRegistration jgUseRegistration = new JgUseRegistration();
@@ -271,6 +269,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
                 // 生成使用登记证编号
                 jgUseRegistration.setUseRegistrationCode(getCode(jgUseRegistration.getSupervisoryCode()));
+                jgUseRegistration.setRegDate(new Date());
             }
         }
         this.getBaseMapper().updateById(jgUseRegistration);
@@ -375,18 +374,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         this.update(jgUseRegistration, lambda);
     }
 
-    public Map<String, Object> getDetail(String id) {
+    public Map<String, Object> getDetail(String id, Long sequenceNbr) {
         Map<String, Object> detail = this.baseMapper.getDetail(id);
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
         Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
         detail.putAll(inspectDetail);
         detail.putAll(useDetail);
-        detail.putAll(useDetail);
         detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
         detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
         detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
         detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
-//        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        if (!ObjectUtils.isEmpty(sequenceNbr)){
+            JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
+            detail.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode());
+        }
         return detail;
     }
 

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

@@ -76,7 +76,8 @@ 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())) {
+		JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr);
+		if (jyjcOpeningApplicationModel == null || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getBaseUnitLicences()) || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getUserInfos())) {
 			throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
 		}
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
@@ -246,4 +247,23 @@ public class JyjcOpeningApplicationController extends BaseController {
 	public ResponseModel<List<TzBaseEnterpriseInfo>> getInspectionUnitList() {
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.getInspectionUnitList());
 	}
+
+	/**
+	 * 作废
+	 *
+	 *
+	 * @param
+	 * @return {@link  ResponseModel< List< TzBaseEnterpriseInfo>>}
+	 * @author yangyang
+	 * @throws
+	 * @date 2023/12/22 16:13
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/discard")
+	@ApiOperation(httpMethod = "PUT", value = "作废", notes = "作废")
+	public ResponseModel<Boolean> doDiscard(@RequestBody Map<String,Object> params) {
+		String sequenceNbr = (String) params.get("sequenceNbr");
+		String remark = (String) params.get("remark");
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.doDiscard(Long.parseLong(sequenceNbr), remark));
+	}
 }

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

@@ -236,6 +236,26 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return this.update(updateWrapper);
     }
 
+    public Boolean doDiscard(Long sequenceNbr, String remark) {
+        if (sequenceNbr == null) {
+            throw new BadRequest("sequenceNbr不能为空！");
+        }
+        JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(sequenceNbr);
+        if (jyjcOpeningApplication == null) {
+            return false;
+        }
+        if (!String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(jyjcOpeningApplication.getStatus())) {
+            throw new BadRequest("只有已完成的申请单才可以作废！");
+        }
+        UpdateWrapper<JyjcOpeningApplication> updateWrapper = new UpdateWrapper<>();
+        updateWrapper
+                .set("status", FlowStatusEnum.TO_BE_DISCARD.getCode())
+                .set("status_name", FlowStatusEnum.TO_BE_DISCARD.getName())
+                .set("remark", remark)
+                .eq("SEQUENCE_NBR", sequenceNbr);
+        return this.update(updateWrapper);
+    }
+
 
     /**
      * 分页查询
@@ -341,7 +361,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         // 获取检验人员信息
         QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
         userInfoQueryWrapper.eq("unit_code", unitCode);
-        userInfoQueryWrapper.eq("is_delete", true);
+        userInfoQueryWrapper.eq("is_delete", false);
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         if (!ValidationUtil.isEmpty(userInfos)) {
             // List<String> codes = userInfos.stream()

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java

@@ -183,7 +183,7 @@ public class TzBaseEnterpriseInfoController {
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/info")
     @ApiOperation(httpMethod = "GET", value = "查询企业端当前登录人所在企业详情", notes = "查询企业端当前登录人所在企业详情")
     public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> pageInfo(PageParam pageParam) {

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

@@ -231,12 +231,13 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         String roles = map.get("role").toString();
         String status = map.get("status").toString();
         String roleGroupCode = map.get("roleGroup").toString();
+        TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr);
 
         FeignClientResult<AgencyUserModel> userResult = null;
         try {
             AgencyUserModel agencyUserModel = new AgencyUserModel();
             agencyUserModel.setUserName(loginName);
-            agencyUserModel.setRealName(loginName);
+            agencyUserModel.setRealName(tzsUserInfo.getName());
             agencyUserModel.setLockStatus(status);
             agencyUserModel.setPassword(pwd);
             agencyUserModel.setRePassword(pwd);
@@ -265,7 +266,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             });
 
             //添加人员管理角色
-            TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr);
+
             String post = tzsUserInfo.getPost();
             if(post.contains(PersonManageRoleEnum.code.getId().toString())){
                 String companyType = tzsUserInfoMapper.selectCompanyTypeById(companySeq);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/RegUnitInfoController.java

@@ -96,7 +96,7 @@ public class RegUnitInfoController extends BaseController {
         return ResponseHelper.buildResponse(iRegUnitInfoService.submit(pageId, taskId, planInstanceId, topic, tableName, kv));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/adminInfo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "查询企业管理员信息", notes = "查询企业管理员信息")
     public ResponseModel<RegUnitInfoDto> adminInfo() {