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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -12,10 +12,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.privilege.model.*;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang3.ObjectUtils;
@@ -41,10 +38,12 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * controller层切面 用于用户数据缓存 供 sql自动填充使用 (使用粒度过大的Aop会创建大量代理对象，影响性能，占用内存，考虑使用
@@ -283,6 +282,14 @@ public class ControllerAop {
 				stopWatch5.stop();
 				logger.info("获取用户信息====>{}s", stopWatch5.getTotalTimeSeconds());
 
+				List<String> appCodes = new ArrayList<>();
+				try {
+					List<ApplicationModel> applicationModelList = Privilege.agencyUserClient.listApps(userList.get(0).getUserId()).getResult();
+					appCodes = applicationModelList.stream().map(ApplicationModel::getAppCode).collect(Collectors.toList());
+				} catch (Exception e) {
+					throw new RuntimeException("获取listApps失败");
+				}
+				userList.get(0).setAppCodes(appCodes);
 				ReginParams regionParams = new ReginParams();
 				regionParams.setCompany(company);
 				regionParams.setRole(role);

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -186,6 +186,23 @@ public class DataDictionaryController extends BaseController {
 		}
 	}
 
+	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/getDataDictionary/{type}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
+	public ResponseModel<Object> getDataDictionary(@PathVariable String type) throws Exception {
+		// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
+		// kongfm 2021-09-08
+		// 数据字典还原 by kongfm 2021-09-09
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.eq("is_delete", false);
+		queryWrapper.orderByAsc("sort_num");
+		Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+
+	return ResponseHelper.buildResponse(list);
+	}
+
+
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/dataDictionaryIdFillMenu", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典,id为SequenceNbr", notes = "根据字典类型查询字典,id为SequenceNbr")

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -25,6 +25,7 @@ public class DateUtils {
     public static final String MINUTE_ONLY_PATTERN = "mm";
     public static final String HOUR_ONLY_PATTERN = "HH";
     public static final String DATE_PATTERN_NUM = "yyyyMMdd";
+    public static final String DATE_PATTERN_MM = "yyyyMM";
     public static final String CHN_DATE_PATTERN_YEAR = "yyyy年";
     public static final String CHN_DATE_PATTERN_MONTH = "MM月";
     public static final String CHN_DATE_PATTERN = "yyyy年MM月dd日";

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import lombok.Getter;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.nio.file.Files;
+
+@Getter
+public class ByteArrayMultipartFile implements MultipartFile {
+
+    private byte[] bytes;
+    private String name;
+    private String originalFilename;
+    private String contentType;
+
+
+    public ByteArrayMultipartFile() {
+    }
+
+    public ByteArrayMultipartFile(String name, String originalFilename, String contentType, byte[] bytes) {
+        super();
+        this.name = name;
+        this.originalFilename = originalFilename;
+        this.contentType = contentType;
+        this.bytes = bytes;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return bytes.length == 0;
+    }
+
+    @Override
+    public long getSize() {
+        return bytes.length;
+    }
+
+    @Override
+    public InputStream getInputStream() {
+        return new ByteArrayInputStream(bytes);
+    }
+
+    @Override
+    public void transferTo(File destination) throws IOException {
+        try (OutputStream outputStream = Files.newOutputStream(destination.toPath())) {
+            outputStream.write(bytes);
+        }
+    }
+}

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "JgInstallationAccDto", description = "")
+public class JgInstallationAccDto {
+    String opinion;
+
+    JgInstallationNoticeDto model;
+}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -95,13 +96,13 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String propertyUnitName;
 
     @ApiModelProperty(value = "使用单位id")
-    private String useUnitId;
+    private String useUnitCreditCode;
 
     @ApiModelProperty(value = "使用单位")
     private String useUnitName;
 
     @ApiModelProperty(value = "接收机构ID")
-    private String receiveOrgId;
+    private String receiveOrgCreditCode;
 
     @ApiModelProperty(value = "接收机构")
     private String receiveOrgName;
@@ -200,10 +201,16 @@ public class JgInstallationNoticeDto extends BaseDto {
     @ApiModelProperty(value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
+    @ApiModelProperty(value = "告知单PDF URL")
+    private String noticeReportUrl;
+
     public String getFullAddress() {
         return (StringUtils.isEmpty(this.provinceName) ? "" : this.provinceName)
                 + (StringUtils.isEmpty(this.cityName) ? "" : this.cityName)
                 + (StringUtils.isEmpty(this.countyName) ? "" : this.countyName)
                 + (StringUtils.isEmpty(this.address) ? "" : this.address);
     }
+   @ApiModelProperty(value = "设备注册代码")
+   private String equRegisterCode;
+
 }

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

@@ -335,4 +335,17 @@ public class JgInstallationNotice extends BaseEntity {
     @TableField("instance_id")
     private String instanceId;
 
+    /**
+     * 告知单PDF URL
+     */
+    @TableField("notice_report_url")
+    private String noticeReportUrl;
+
+    /**
+     * 设备注册编码
+     */
+    @TableField("equ_register_code")
+    private String equRegisterCode;
+
+
 }

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

@@ -25,7 +25,12 @@ public enum  FlowStatusEnum {
     /**
      * 已驳回
      */
-    REJECTED(6614, "已驳回");
+    REJECTED(6614, "已驳回"),
+
+    /**
+     * 已撤回
+     */
+    ROBACK(6615, "已撤回");
 
     private final int code;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgInstallationNoticeService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.service;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 
@@ -13,7 +14,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2023-12-12
  */
-public interface IJgInstallationNoticeService {
+public interface IJgInstallationNoticeService extends IService<JgInstallationNotice> {
 
     /**
      * 根据sequenceNbr查询
@@ -56,4 +57,12 @@ public interface IJgInstallationNoticeService {
      * @param submitType 保存类型
      */
     void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> model);
+
+    /**
+     * 打印告知单
+     *
+     * @param sequenceNbr 主键
+     * @return pdf文件路径
+     */
+    String generateInstallationNoticeReport(Long sequenceNbr);
 }

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

@@ -16,7 +16,8 @@
             isn.province_name AS provinceName,
             isn.city_name AS cityName,
             isn.county_name AS countyName,
-            isn.instance_id AS instanceId
+            isn.instance_id AS instanceId,
+            isn.notice_report_url AS noticeReportUrl
         FROM
             tzs_jg_installation_notice isn
         <where>
@@ -39,7 +40,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND isn.notice_status in ('6612', '6613', '6614')
+                AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )
             </if>
         </where>
         ORDER BY
@@ -49,10 +50,22 @@
     <select id="queryEquipInformation" resultType="java.util.Map">
         select
             isn.sequence_nbr AS sequenceNbr,
+            isn.install_unit_name AS installUnitName,
+            isn.apply_no AS applyNo,
+            isn.province_name AS provinceName,
+            isn.city_name AS cityName,
+            isn.county_name AS countyName,
+            isn.address AS address,
+            isn.install_start_date AS installStartDate,
+            isn.install_license_no AS installLicenseNo,
+            isn.install_license_expiration_date AS installLicenseExpirationDate,
+            isn.install_leader_name AS installLeaderName,
+            isn.install_leader_phone AS installLeaderPhone,
+            isn.use_unit_name AS useUnitName,
+            isn.equ_register_code AS equRegisterCode,
             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,
@@ -77,7 +90,13 @@
             fi.produce_country AS produceCountry,
             fi.factory_standard AS factoryStandard,
             fi.product_quality_yield_prove AS productQualityYieldProve,
-            fi.ins_use_maintain_explain AS insUseMaintainExplain
+            fi.ins_use_maintain_explain AS insUseMaintainExplain,
+            ui.safety_manager AS safetyManager,
+            ui.phone AS safetyManagerPhone,
+            ui.PROVINCE_NAME AS useUnitProvinceName,
+            ui.CITY_NAME AS useUnitCityName,
+            ui.COUNTY_NAME AS useUnitCountyName,
+            ui.ADDRESS AS useUnitAddress
         FROM
             tzs_jg_installation_notice isn
                 LEFT JOIN tzs_jg_relation_equip re ON re.business_id = isn.sequence_nbr
@@ -85,7 +104,9 @@
                 LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equip_id
                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equip_id
                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equip_id
+                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equip_id
         WHERE
             isn.sequence_nbr = #{sequenceNbr}
+        LIMIT 1
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/pom.xml

@@ -31,6 +31,12 @@
             <version>1.10.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.aspose</groupId>
+            <artifactId>aspose-words</artifactId>
+            <version>19.5jdk</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationAccDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 安装告知
+ *
+ * @author system_generator
+ * @date 2023-12-12
+ */
+@RestController
+@Api(tags = "安装告知工作流相关Api")
+@RequestMapping(value = "/jg-installation-workflow")
+public class JgInstallationByWorkFlowController {
+
+
+    @Autowired
+    JgInstallationNoticeServiceImpl jgInstallationNoticeServiceImpl;
+
+    /**
+     * 提交
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/submit")
+    @ApiOperation(httpMethod = "POST", value = "安装告知提交", notes = "安装告知提交")
+    public ResponseModel<JgInstallationNoticeDto> submit(@RequestBody JgInstallationNoticeDto model, String op) {
+        // TODO 发起安装告知流程
+        // jgInstallationNoticeServiceImpl.submit(model, op);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 撤销
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/cancel")
+    @ApiOperation(httpMethod = "POST", value = "安装告知撤销", notes = "安装告知撤销")
+    public ResponseModel<JgInstallationNoticeDto> cancel(@RequestBody Map<String, Object> model) {
+        JgInstallationNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgInstallationNoticeDto.class, true);
+        if (Objects.isNull(installationInfo)) {
+            throw new IllegalArgumentException("参数installationInfo不能为空");
+        }
+        jgInstallationNoticeServiceImpl.cancel(installationInfo);
+        return ResponseHelper.buildResponse(installationInfo);
+    }
+
+    /**
+     * 受理
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/accept")
+    @ApiOperation(httpMethod = "POST", value = "安装告知受理", notes = "安装告知受理")
+    public ResponseModel<JgInstallationNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
+        // TODO 受理安装告知流程
+        LinkedHashMap model1 = (LinkedHashMap)model.get("model");
+        LinkedHashMap form = (LinkedHashMap)model1.get("form");
+        LinkedHashMap installationInfo = (LinkedHashMap)form.get("installationInfo");
+        JgInstallationNoticeDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgInstallationNoticeDto.class);
+        jgInstallationNoticeServiceImpl.accept(jgInstallationNoticeDto,op);
+        return ResponseHelper.buildResponse(null);
+    }
+}

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
-import org.omg.PortableInterceptor.SUCCESSFUL;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -24,8 +18,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Map;
 import java.util.Objects;
 
@@ -41,7 +33,7 @@ import java.util.Objects;
 public class JgInstallationNoticeController extends BaseController {
 
     @Autowired
-    JgInstallationNoticeServiceImpl jgInstallationNoticeServiceImpl;
+    private IJgInstallationNoticeService iJgInstallationNoticeService;
 
     /**
      * 新增
@@ -49,12 +41,12 @@ public class JgInstallationNoticeController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增安装告知", notes = "新增安装告知")
-	public ResponseModel<String> save(@RequestParam String submitType,@RequestBody Map<String, JgInstallationNoticeDto> model) {
-		jgInstallationNoticeServiceImpl.saveNotice(submitType, model);
-	    return ResponseHelper.buildResponse("");
-	}
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增安装告知", notes = "新增安装告知")
+    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, JgInstallationNoticeDto> model) {
+        iJgInstallationNoticeService.saveNotice(submitType, model);
+        return ResponseHelper.buildResponse("");
+    }
 
     /**
      * 根据sequenceNbr更新
@@ -69,7 +61,7 @@ public class JgInstallationNoticeController extends BaseController {
         if (Objects.isNull(installationInfo)) {
             throw new IllegalArgumentException("参数installationInfo不能为空");
         }
-        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.updateInstallationNotice(installationInfo, op));
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.updateInstallationNotice(installationInfo, op));
     }
 
     /**
@@ -81,7 +73,7 @@ public class JgInstallationNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除安装告知", notes = "根据sequenceNbr删除安装告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long[] sequenceNbr) {
-        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.removeById(sequenceNbr));
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.removeById(sequenceNbr));
     }
 
     /**
@@ -94,7 +86,7 @@ public class JgInstallationNoticeController extends BaseController {
     @ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
     public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
         try {
-            return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.deleteForBatch(sequenceNbrs));
+            return ResponseHelper.buildResponse(iJgInstallationNoticeService.deleteForBatch(sequenceNbrs));
         } catch (Exception e) {
             return CommonResponseUtil.failure(e.getMessage());
         }
@@ -110,7 +102,7 @@ public class JgInstallationNoticeController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个安装告知", notes = "根据sequenceNbr查询单个安装告知")
     public ResponseModel<Map<String,
             Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.queryBySequenceNbr(sequenceNbr));
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.queryBySequenceNbr(sequenceNbr));
     }
 
 
@@ -131,18 +123,16 @@ public class JgInstallationNoticeController extends BaseController {
             @RequestBody(required = false) JgInstallationNoticeDto model
     ) {
         Page<JgInstallationNotice> page = new Page<>(current, size);
-        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.queryForJgInstallationNoticePage(page, model, type));
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.queryForJgInstallationNoticePage(page, model, type));
     }
 
     /**
-     * 列表全部数据查询
-     *
-     * @return
+     * 生成告知单
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "安装告知列表全部数据查询", notes = "安装告知列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<JgInstallationNoticeDto>> selectForList() {
-        return ResponseHelper.buildResponse(jgInstallationNoticeServiceImpl.queryForJgInstallationNoticeList());
+    @GetMapping(value = "/generate-report")
+    public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(iJgInstallationNoticeService.generateInstallationNoticeReport(sequenceNbr));
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TzsServiceFeignClient.java

+package com.yeejoin.amos.boot.module.jg.biz.feign;
+
+
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+@FeignClient(name = "TZS-YMT-LL", url = "172.16.3.155:11000", path = "/ymt", configuration =
+        {FeignConfiguration.class})
+public interface TzsServiceFeignClient {
+
+
+    /**
+     * 创建监管码及96333
+     *
+     * @param map 请求体
+     * @return
+     */
+    @RequestMapping(value = "/equipment-category/createSupervisorCode", method = RequestMethod.POST)
+    ResponseModel<Map<String, Object>> createCode(@RequestBody Map<String, Object> map);
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/ImageUtils.java

@@ -12,6 +12,7 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URLEncoder;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -302,4 +303,35 @@ public class ImageUtils {
         }
 
     }
+
+    /**
+     * 生成二维码（白色背景），并将其转换成base64
+     *
+     * @param text   二维码内容
+     * @param width  二维码宽度
+     * @param height 二维码高度
+     * @return base64
+     */
+    public static String generateQRCode(String text, int width, int height) {
+        try {
+            MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
+            BitMatrix bm = multiFormatWriter.encode(text, BarcodeFormat.QR_CODE, width, height, hints);
+            BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            // 二维码颜色:黑色
+            int QRCOLOR = 0x201f1f;
+            //二维码背景颜色:白色
+            int BGWHITE = 0xFFFFFF;
+            for (int x = 0; x < width; x++) {
+                for (int y = 0; y < height; y++) {
+                    image.setRGB(x, y, bm.get(x, y) ? QRCOLOR : BGWHITE);
+                }
+            }
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            ImageIO.write(image, "png", outputStream);
+            return Base64.getEncoder().encodeToString(outputStream.toByteArray());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/utils/WordTemplateUtils.java

+package com.yeejoin.amos.boot.module.jg.biz.utils;
+
+import com.aspose.words.Document;
+import com.aspose.words.License;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@Slf4j
+public class WordTemplateUtils {
+
+    public static final String BASE_PACKAGE_PATH = "/templates";
+    private static WordTemplateUtils wordTemplateUtils;
+    private final Configuration configuration;
+
+    private WordTemplateUtils() {
+        configuration = new Configuration(Configuration.VERSION_2_3_23);
+    }
+
+    public static synchronized WordTemplateUtils getInstance() {
+        if (wordTemplateUtils == null) {
+            wordTemplateUtils = new WordTemplateUtils();
+        }
+        return wordTemplateUtils;
+    }
+
+    /**
+     * 创建doc并写入内容
+     *
+     * @param templatePath doc模板文件路径
+     * @param dataMap      内容
+     * @param template     模板
+     * @return doc文件
+     */
+    private File createDoc(String templatePath, Map<String, ?> dataMap, Template template) throws TemplateException, IOException {
+        // templatePath在后缀之前加上UUID是为了防止并发时多个线程使用同一个模板文件而导致生成的Word文档内容不一致
+        int i = templatePath.lastIndexOf(".");
+        templatePath = UUID.randomUUID() + templatePath.substring(i);
+
+        if (templatePath.endsWith(".ftl")) {
+            templatePath = templatePath.replace(".ftl", ".doc");
+        }
+        File docFile = new File(templatePath);
+        try (
+                // 这个地方不能使用FileWriter因为需要指定编码类型否则生成的Word文档会因为有无法识别的编码而无法打开
+                Writer writer = new OutputStreamWriter(Files.newOutputStream(docFile.toPath()), StandardCharsets.UTF_8)
+        ) {
+            template.process(dataMap, writer);
+        }
+        return docFile;
+    }
+
+    public File fillAndConvertDocFile(String templatePath, String targetFileName, Map<String, ?> map, int saveFormat) throws Exception {
+        // 指定模板所在包路径
+        configuration.setClassForTemplateLoading(this.getClass(), BASE_PACKAGE_PATH);
+
+        // 获取模板, 生成Word文档
+        Template freemarkerTemplate = configuration.getTemplate(templatePath, "UTF-8");
+        File docFile = createDoc(templatePath, map, freemarkerTemplate);
+
+        // 转换Word文档
+        File converedFile = converDocFile(docFile.getAbsolutePath(), targetFileName, saveFormat);
+
+        // 删除临时文件
+        Files.deleteIfExists(docFile.toPath());
+
+        return converedFile;
+    }
+
+    /**
+     * word转换
+     *
+     * @param docPath    word文件路径
+     * @param targetPath 转换后文件路径
+     * @param saveFormat 目标文件类型 取自 com.aspose.words.SaveFormat
+     */
+    private File converDocFile(String docPath, String targetPath, int saveFormat) throws Exception {
+        // 验证License 若不验证则转化出的pdf文档会有水印产生
+        if (!getLicense()) {
+            throw new RuntimeException("验证License失败");
+        }
+
+        if (StringUtils.isEmpty(docPath)) {
+            throw new FileNotFoundException("文档文件不存在");
+        }
+
+        try (
+                InputStream inputStream = Files.newInputStream(Paths.get(docPath));
+                OutputStream outputStream = Files.newOutputStream(Paths.get(targetPath));
+        ) {
+            File targetFile = new File(targetPath);
+            Document doc = new Document(inputStream);
+            doc.save(outputStream, saveFormat);
+            return targetFile;
+        }
+    }
+
+
+    /**
+     * 获取License
+     *
+     * @return boolean
+     */
+    private boolean getLicense() {
+        boolean result = false;
+        try {
+            String s = "<License><Data><Products><Product>Aspose.Total for Java</Product><Product>Aspose.Words for Java</Product></Products><EditionType>Enterprise</EditionType><SubscriptionExpiry>20991231</SubscriptionExpiry><LicenseExpiry>20991231</LicenseExpiry><SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber></Data><Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature></License>";
+            ByteArrayInputStream is = new ByteArrayInputStream(s.getBytes());
+            License license = new License();
+            license.setLicense(is);
+            result = true;
+        } catch (Exception e) {
+            log.error("获取License失败", e);
+        }
+        return result;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/logback-dev.xml

@@ -50,7 +50,7 @@
     <logger name="com.yeejoin" level="INFO"/>
 
     <!-- 日志输出级别 -->
-    <root level="DEBUG">
+    <root level="INFO">
         <!-- <appender-ref ref="FILE" /> -->
         <appender-ref ref="STDOUT" />
 <!--        <appender-ref ref="ELK" />-->

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

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.jyjc.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
 import java.util.Date;
 
 /**
@@ -158,6 +158,9 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("workflow_node")
     private String workflowNode;
 
-
-
+    /**
+     * 检验结果方式
+     */
+    @TableField("result_type")
+    private String resultType;
 }

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

 package com.yeejoin.amos.boot.module.jyjc.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 import java.util.Date;
 
@@ -155,4 +154,16 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField("inspection_type_name")
     private String inspectionTypeName;
+
+    /**
+     * 报检日期
+     */
+    @TableField("application_date")
+    private Date applicationDate;
+
+    /**
+     * 检验结果方式
+     */
+    @TableField("result_type")
+    private String resultType;
 }

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

@@ -7,6 +7,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 
  *
@@ -45,4 +48,10 @@ public class JyjcInspectionResultAttachment extends BaseEntity {
 	@TableField("remark")
     private String remark;
 
+    /**
+     * 附件地址
+     */
+    @TableField(exist = false)
+    private List<Object> attachmentUrlList;
+
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -66,6 +67,7 @@ public class JyjcOpeningApplication extends BaseEntity {
      * 有效期至
      */
 	@TableField("expiry_date")
+    @JsonFormat (pattern = "yyyy-MM-dd")
     private Date expiryDate;
 
     /**

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

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+public enum AttachmentTypeEnum {
+
+    SPECIAL_EQUIPMENT_REPORT("特种设备检验报告","1"),
+    INSPECTION_CERTIFICATE("监检证书","2");
+    private String name;
+
+
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+    AttachmentTypeEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

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

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * ProjectName: amos-boot-biz
+ * PackageName: com.yeejoin.amos.boot.module.jyjc.api.enums
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/12/15 16:25
+ */
+@Getter
+@AllArgsConstructor
+public enum BizTypeEnum {
+
+    SUPERVISE("supervise", "监督检验"),
+    FIRST_INSPECTION("firstinspect", "定检"),
+    DETECTION("detection", "检测");
+
+    private String code;
+    private String name;
+
+    public static List<String> getEnumNameList() {
+        List<String> codeList = new ArrayList<String>();
+        for (BizTypeEnum c : BizTypeEnum.values()) {
+            codeList.add(c.getCode());
+        }
+        return codeList;
+    }
+}

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

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationAttachment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *  Mapper 接口
  *
@@ -13,4 +16,6 @@ public interface JyjcInspectionApplicationAttachmentMapper extends BaseMapper<Jy
 
    public void deleteByApplicationSeq(Long applicationSeq);
 
+  public List<Map<String,Object>> getDataByApplicationSeq(Long applicationSeq);
+
 }

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

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -14,4 +19,8 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
 
 
    public Page<JyjcInspectionApplication> queryForDataList( Page<JyjcInspectionApplication> page, String applicationNo, String inspectionClassify, String applicationUnitCode,String applicationUnitName, String equipClassify, String inspectionUnitCode,String inspectionUnitName, String applicationDate, String acceptDate, String inspectionChargePerson, String status , String bizType);
+
+   Page<JyjcInspectionApplicationEquipModel> listByCategory(Page<JyjcInspectionApplicationEquipModel> page,@Param("equipClassify")  String equipClassify);
+
+   JyjcInspectionApplicationModel selectDataBySeq(Long sequenceNbr);
 }

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

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JyjcInspectionApplicationPushLogMapper extends BaseMapper<JyjcInspectionApplicationPushLog> {
 
+    void deleteByApplicationSeq(Long seq);
 }

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

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JyjcInspectionEquipStatisticsMapper extends BaseMapper<JyjcInspectionEquipStatistics> {
 
+    void deleteByApplicationSeq(Long seq);
 }

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

@@ -2,22 +2,22 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+import java.util.Date;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JyjcInspectionApplicationEquipModel", description="")
+@ApiModel(value = "JyjcInspectionApplicationEquipModel", description = "")
 public class JyjcInspectionApplicationEquipModel extends BaseModel {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "报检申请表主键")
@@ -29,4 +29,60 @@ public class JyjcInspectionApplicationEquipModel extends BaseModel {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "业务类型（与菜单对应拆表使用）")
+    private String bizType;
+
+    @ApiModelProperty(value = "设备类别")
+    private String equCategory;
+
+    @ApiModelProperty(value = "设备类别名称")
+    private String equCategoryName;
+
+    @ApiModelProperty(value = "检验检测类型编码")
+    private String inspectionType;
+
+    @ApiModelProperty(value = "检验检测类型名称（冗余）")
+    private String inspectionTypeName;
+
+    @ApiModelProperty(value = "报检日期")
+    private Date applicationDate;
+
+    @ApiModelProperty("检验结果方式")
+    private String resultType;
+
+    @ApiModelProperty(value = "设备种类")
+    private String equList;
+
+    @ApiModelProperty(value = "设备种类名称")
+    private String equListName;
+
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useOrgCode;
+
+    @ApiModelProperty(value = "单位内部编号")
+    private String useInnerCode;
+
+    @ApiModelProperty(value = "注册代码")
+    private String equCode;
+
+    @ApiModelProperty(value = "设备使用地点省")
+    private String provinceName;
+
+    @ApiModelProperty(value = "设备使用地点市")
+    private String cityName;
+
+    @ApiModelProperty(value = "设备使用地点区")
+    private String countyName;
+
+    @ApiModelProperty(value = "设备使用地点街道")
+    private String streetName;
+
+    @ApiModelProperty(value = "设备使用地点详细")
+    private String address;
+
+    @ApiModelProperty(value = "使用单位")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
 }

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

@@ -2,25 +2,24 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JyjcInspectionApplicationModel", description="")
+@ApiModel(value = "JyjcInspectionApplicationModel", description = "")
 public class JyjcInspectionApplicationModel extends BaseModel {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "检验检测单位编码")
@@ -67,6 +66,12 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "报检单位编号")
     private String applicationUnitCode;
+    @ApiModelProperty(value = "报检单位名称")
+    private String applicationUnitName;
+    @ApiModelProperty(value = "报检单位地址")
+    private String address;
+    @ApiModelProperty(value = "监管单位名称")
+    private String superviseOrgName;
 
     @ApiModelProperty(value = "包含设备数量（冗余）")
     private Integer numberOfEquip;
@@ -77,7 +82,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "工作流实例ID")
     private String processInstanceId;
 
-   @ApiModelProperty(value = "工作流key")
+    @ApiModelProperty(value = "工作流key")
     private String processKey;
 
     @ApiModelProperty(value = "申请单二维码")
@@ -98,20 +103,43 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
     private String workflowNode;
 
-
  @ApiModelProperty(value = "告知书")
  private List<Map<String,Object>> gzs;
  @ApiModelProperty(value = "产品质量证明书")
  private List<Map<String,Object>> cpzl;
  @ApiModelProperty(value = "施工自行检查报告")
  private List<Map<String,Object>> sgzx ;
- @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
+ @ApiModelProperty(value = "施工合同或证明")
  private List<Map<String,Object>> sght;
- @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
+ @ApiModelProperty(value = "施工方案/施工设计文件")
  private List<Map<String,Object>> sgfa;
- @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
+ @ApiModelProperty(value = "施工单位许可证书")
  private List<Map<String,Object>> sgdwxk;
+ @ApiModelProperty(value = "型式试验证书")
+ private List<Map<String,Object>> xssy;
+ @ApiModelProperty(value = "限速器和渐进式安全钳的调试证书")
+ private List<Map<String,Object>> xsqts;
+ @ApiModelProperty(value = "土建声明")
+ private List<Map<String,Object>> tjsm;
+ @ApiModelProperty(value = "质量保证手册和程序文件")
+ private List<Map<String,Object>> zlbz;
+ @ApiModelProperty(value = "施工作业文件")
+ private List<Map<String,Object>> sgzy;
+ @ApiModelProperty(value = "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书")
+ private List<Map<String,Object>> sgry;
+ @ApiModelProperty(value = "产品技术文件")
+ private List<Map<String,Object>> cpjs;
+ @ApiModelProperty(value = "施工设计文件")
+ private List<Map<String,Object>> sgsj;
+ @ApiModelProperty(value = "施工分包方目录")
+ private List<Map<String,Object>> sgfb;
+ @ApiModelProperty(value = "分包方评价资料")
+ private List<Map<String,Object>> fbspj;
  @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
  private List<Map<String,Object>> equip;
 
+    @ApiModelProperty("检验结果方式")
+    private String resultType;
+
+
 }

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

@@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 业务开通申请表
@@ -31,6 +33,7 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "报检单位编号")
     private String applicationUnitCode;
 
+    //监管码
     @ApiModelProperty(value = "设备唯一标识")
     private String equipUnicode;
 
@@ -91,12 +94,15 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "检验检测类型名称（冗余）")
     private String inspectionTypeName;
 
+    @ApiModelProperty(value = "报检日期")
+    private Date applicationDate;
+
+    @ApiModelProperty("检验结果方式")
+    private String resultType;
+
     @ApiModelProperty(value = "设备种类")
     private String equList;
 
-    @ApiModelProperty(value = "监管码")
-    private String supervisoryCode;
-
     @ApiModelProperty(value = "使用登记证编号")
     private String useOrgCode;
 
@@ -120,8 +126,8 @@ public class JyjcInspectionResultModel extends BaseModel {
     private String useUnitCreditCode;
 
     @ApiModelProperty(value = "检验结果技术参数")
-    private JyjcInspectionResultParamModel resultParamModel;
+    private Map<String,Object> resultParamModelMap;
 
-    @ApiModelProperty(value = "检验结果附件")
-    private JyjcInspectionResultAttachmentModel resultAttachmentModel;
+    @ApiModelProperty(value = "附件类型(特种设备检验报告:1,监检证书:2)")
+    private String attachmentType;
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
@@ -44,6 +45,7 @@ public class JyjcOpeningApplicationModel extends BaseModel {
     private String resultType;
 
     @ApiModelProperty (value = "有效期至")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date expiryDate;
 
     @ApiModelProperty (value = "受理日期（接收日期）")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationHandlerService.java

+package com.yeejoin.amos.boot.module.jyjc.api.service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * ProjectName: amos-boot-biz
+ * PackageName: com.yeejoin.amos.boot.module.jyjc.api.service
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/12/15 15:55
+ */
+public interface IJyjcInspectionApplicationHandlerService {
+
+    String type();
+
+
+    boolean notifyInspectionUnit(Map<String, Object> params);
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionApplicationService.java

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+
+import java.util.List;
+
 /**
  * 接口类
  *
  * @author system_generator
  * @date 2023-12-14
  */
-public interface IJyjcInspectionApplicationService {}
+public interface IJyjcInspectionApplicationService {
+    void deleteBatchData(List<Long> sequenceNbr);
+
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionResultParamService.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jyjc.api.service;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 检验结果技术参数表接口类
@@ -17,4 +18,11 @@ public interface IJyjcInspectionResultParamService {
      * @return
      */
     List<JyjcInspectionResultParam> getParamByResultSeq(Long sequenceNbr);
+
+    /**
+     * 根据设备code获取技术参数字段
+     * @param equipTypeCode 设备code
+     * @return 字段列表
+     */
+    List<Map<String,Object>> getParamByEquipTypeCode(String equipTypeCode);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionResultService.java

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
+import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,4 +21,12 @@ public interface IJyjcInspectionResultService {
      * @return 检验结果实体
      */
     Map<String, Object> queryDetailBySeq(Long sequenceNbr);
+
+    /**
+     * 获取设备种类
+     * @param type 获取的类型
+     * @param notNode 不需要节点
+     * @return 列表
+     */
+    List<Map<String,Object>> equipList(String type, String notNode);
 }

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

@@ -8,8 +8,16 @@
         from
         tz_jyjc_inspection_application_attachment
         where
-        application_seq = #{applicationSeq}
+        application_seq =
+        #{applicationSeq}
 
 
     </delete>
+    <select id="getDataByApplicationSeq" resultType="map">
+
+        select *
+        from tz_jyjc_inspection_application_attachment
+        where application_seq = #{applicationSeq}
+
+    </select>
 </mapper>

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

@@ -5,26 +5,27 @@
     <select id="queryForDataList"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication">
         select
-        tzjia.applicationNo,
-        tzjia.inspectionType,
-        tzjia.inspectionUnitName,
-        tzjia.equipClassify,
-        tzjia.numberOfEquip,
-        tzjia.inspectionUnitName,
-        tzjia.applicationDate,
-        tzjia.acceptDate,
-        tzjia.inspectionChargePerson,
-        tzjia.inspectionChargePhone,
+        tzjia.application_no,
+        tzjia.inspection_type,
+        (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.inspection_classify and cb_data_dictionary.type = 'JYJCLB') as inspectionClassify,
+        tzjia.inspection_unit_code,
+        (select name from  cb_data_dictionary  where cb_data_dictionary.code = tzjia.equip_classify and cb_data_dictionary.type = 'BJSBZL') as equipClassify,
+        tzjia.number_of_equip,
+        tzjia.inspection_unit_code,
+        tzjia.application_date,
+        tzjia.accept_date,
+        tzjia.inspection_charge_phone,
+        tzjia.inspection_charge_person,
         tzjia.status
         from
         tz_jyjc_inspection_application as tzjia
-        where
-        tzjia.is_delete = 0
+        <where>
+
         <if test=" applicationNo != null and applicationNo != ''">
-            and applicationNo like concat('%',#{applicationNo}.'%')
+            and application_no like concat('%',#{applicationNo}.'%')
         </if>
-        <if test="inspectionType != null and inspectionType != ''">
-            and inspectionType = #{inspectionType}
+        <if test="inspectionClassify != null and inspectionClassify != ''">
+            and inspection_classify = #{inspectionClassify}
         </if>
         <if test="inspectionUnitName != null and inspectionUnitName != ''">
             and inspection_unit_code in (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{inspectionUnitName},'%'))
@@ -39,22 +40,16 @@
             and application_unit_code in (select use_code from tz_base_enterprise_info where use_unit like concat('%',#{inspectionUnitName},'%'))
         </if>
         <if test="equipClassify != null and equipClassify != ''">
-            and equipClassify = #{equipClassify}
-        </if>
-        <if test="numberOfEquip != null and numberOfEquip != ''">
-            and numberOfEquip = #{numberOfEquip}
+            and equip_classify = #{equipClassify}
         </if>
         <if test="applicationDate != null and applicationDate != ''">
-            and applicationDate = #{applicationDate}
+            and application_date = #{applicationDate}
         </if>
         <if test="acceptDate != null and acceptDate != ''">
-            and acceptDate = #{acceptDate}
+            and accept_date = #{acceptDate}
         </if>
         <if test="inspectionChargePerson != null and inspectionChargePerson != ''">
-            and inspectionChargePerson like concat('%',#{inspectionChargePerson}.'%')
-        </if>
-        <if test="inspectionChargePhone != null and inspectionChargePhone != ''">
-            and inspectionChargePhone  like concat('%',#{inspectionChargePhone}.'%')
+            and inspection_charge_person like concat('%',#{inspectionChargePerson}.'%')
         </if>
         <if test="status != null and status != ''">
             and status = #{status}
@@ -62,5 +57,48 @@
         <if test="bizType != null and bizType != ''">
             and biz_type = #{bizType}
         </if>
+        </where>
+    </select>
+    <select id="listByCategory"
+            resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel">
+        select
+            use_unit_name,
+            use_unit_credit_code,
+            province_name,
+            city_name,
+            county_name,
+            street_name,
+            address,
+            use_inner_code,
+            equ_list,
+            tec1.name equ_list_name,
+            equ_category,
+            tec.name equ_category_name,
+            use_org_code,
+            equ_code,
+            supervisory_code
+        from
+            idx_biz_jg_use_info ibjui
+            left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
+            left join idx_biz_jg_other_info ibjoi on ibjui.record = ibjoi.record
+            left join amos_tzs_biz.tz_equipment_category tec on ibjri.equ_category = tec.code
+            left join amos_tzs_biz.tz_equipment_category tec1 on ibjri.equ_list = tec1.code
+        <where>
+            <if test="equipClassify != null and equipClassify != ''">
+                and equ_list = #{equipClassify}
+            </if>
+        </where>
+    </select>
+    <select id="selectDataBySeq" resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel">
+        SELECT
+            tzjia.*,
+            tbei.supervise_org_name AS superviseOrgName,
+            tbei.use_unit AS applicationUnitName,
+            tbei.address AS address
+        FROM
+            tz_jyjc_inspection_application AS tzjia
+                LEFT JOIN tz_base_enterprise_info tbei ON tzjia.application_unit_code = tbei.use_code
+        WHERE
+            tzjia.sequence_nbr = #{sequenceNbr}
     </select>
 </mapper>

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

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationPushLogMapper">
 
+    <delete id="deleteByApplicationSeq">
+        delete
+        *
+        from
+        tz_jyjc_inspection_application_push_log
+        where
+        application_seq = #{applicationSeq}
+    </delete>
 </mapper>

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

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionEquipStatisticsMapper">
 
+    <delete id="deleteByApplicationSeq">
+        delete
+        *
+        from
+        tz_jyjc_inspection_equip_statistics
+        where
+        application_seq = #{applicationSeq}
+    </delete>
 </mapper>

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

@@ -4,22 +4,54 @@
 
     <select id="selectJyjcInspectionResultpPage"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel">
-        SELECT sequence_nbr, inspection_unit_code, application_no, application_unit_code, equip_unicode, result_status,
-        license_number, result_no, inspector, inner_person_code, inspection_conclusion, inspection_date,
-        next_inspection_date, inspection_start_date, inspection_end_date, inspection_result_summary, non_conformance,
-        rectification, remark, rec_user_id, rec_date, biz_type
-        FROM tz_jyjc_inspection_result
+        select res.sequence_nbr, res.inspection_unit_code, res.application_no, res.application_unit_code,
+        res.equip_unicode, res.result_status, res.license_number, res.result_no, res.inspector, res.inner_person_code,
+        res.inspection_conclusion, res.inspection_date, res.next_inspection_date, res.inspection_start_date,
+        res.inspection_end_date, res.inspection_result_summary, res.non_conformance, res.rectification, res.remark,
+        res.rec_user_id, res.rec_date, res.biz_type,res.equ_category, res.inspection_type, res.inspection_type_name,
+        res.application_date,use_unit_name, use_unit_credit_code, province_name, city_name, county_name, street_name,
+        address, equ_code, use_inner_code, equ_list, tec1.name equ_list_name, ibjri.equ_category, tec.name
+        equ_category_name, use_org_code
+        from tz_jyjc_inspection_result res
+        left join idx_biz_jg_other_info ibjoi on res.equip_unicode = ibjoi.supervisory_code
+        left join idx_biz_jg_use_info ibjui on ibjui.record = ibjoi.record
+        left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
+        left join tz_equipment_category tec on ibjri.equ_category = tec.code
+        left join tz_equipment_category tec1 on ibjri.equ_list = tec1.code
         <where>
             <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
-                and application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
+                and res.application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
             </if>
             <if test="jyjcInspectionResultModel.inspectionUnitCode != '' and jyjcInspectionResultModel.inspectionUnitCode != null">
-                and inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
+                and res.inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
             </if>
             <if test="jyjcInspectionResultModel.applicationUnitCode != '' and jyjcInspectionResultModel.applicationUnitCode != null">
-                and application_unit_code  =  #{jyjcInspectionResultModel.applicationUnitCode}
+                and res.application_unit_code = #{jyjcInspectionResultModel.applicationUnitCode}
+            </if>
+            <if test="jyjcInspectionResultModel.useUnitCreditCode != '' and jyjcInspectionResultModel.useUnitCreditCode != null">
+                and use_unit_credit_code like concat('%',#{jyjcInspectionResultModel.useUnitCreditCode},'%')
+            </if>
+            <if test="jyjcInspectionResultModel.useInnerCode != '' and jyjcInspectionResultModel.useInnerCode != null">
+                and use_inner_code like concat('%',#{jyjcInspectionResultModel.useInnerCode},'%')
+            </if>
+            <if test="jyjcInspectionResultModel.equCode != '' and jyjcInspectionResultModel.equCode != null">
+                and equ_code like concat('%',#{jyjcInspectionResultModel.equCode},'%')
+            </if>
+            <if test="jyjcInspectionResultModel.useOrgCode != '' and jyjcInspectionResultModel.useOrgCode != null">
+                and use_org_code like concat('%',#{jyjcInspectionResultModel.useOrgCode},'%')
+            </if>
+            <if test="jyjcInspectionResultModel.equipUnicode != '' and jyjcInspectionResultModel.equipUnicode != null">
+                and res.equip_unicode like concat('%',#{jyjcInspectionResultModel.equipUnicode},'%')
+            </if>
+            <if test="jyjcInspectionResultModel.equCategory != '' and jyjcInspectionResultModel.equCategory != null">
+                and ibjri.equ_category = #{jyjcInspectionResultModel.equCategory}
+            </if>
+            <if test="jyjcInspectionResultModel.inspectionType != '' and jyjcInspectionResultModel.inspectionType != null">
+                and res.inspection_type = #{jyjcInspectionResultModel.inspectionType}
+            </if>
+            <if test="jyjcInspectionResultModel.applicationDate!=null">
+                AND TO_DAYS(res.application_date) = TO_DAYS(#{jyjcInspectionResultModel.applicationDate})
             </if>
         </where>
-
     </select>
 </mapper>

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

@@ -23,8 +23,8 @@
         workflow_prostance_id,
         workflow_role,
         unit_code_name,
-        status,
-        status_name
+        status_name,
+        workflow_active_key
         from tz_jyjc_opening_application
         <where>
             <if test="jyjcOpeningApplicationRequstDto.applicationSeq != '' and jyjcOpeningApplicationRequstDto.applicationSeq != null">

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/BaseException.java

 package com.yeejoin.amos.boot.module.jyjc.biz.config;
 
+
 import com.yeejoin.amos.boot.module.ymt.api.enums.BaseExceptionEnum;
 
 /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/CommonException.java

 package com.yeejoin.amos.boot.module.jyjc.biz.config;
 
 
-import com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
 import com.yeejoin.amos.boot.module.ymt.api.enums.CommonErrorEnum;
 
 /**

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
-import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonserviceImpl;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcOpeningApplicationServiceImpl;
-import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
- *
  * @author system_generator
  * @date 2023-12-13
  */
@@ -39,9 +24,8 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/common")
 public class CommonController extends BaseController {
 
-	@Autowired
-	CommonserviceImpl commonserviceImpl;
-
+    @Autowired
+    CommonserviceImpl commonserviceImpl;
 
     /**
      * 新增
@@ -49,10 +33,21 @@ public class CommonController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/getJyjcPersonByUnitCode")
-	@ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员列表", notes = "根据公司的unitCode获取检测检验人员列表")
-	public ResponseModel<List<TzsUserInfo>> getUserInfosByUnitCode(@RequestParam String unitCode) {
-	    return ResponseHelper.buildResponse(commonserviceImpl.getUserInfosByUnitCode(unitCode));
-	}
+    @PostMapping(value = "/getJyjcPersonByUnitCode")
+    @ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员列表", notes = "根据公司的unitCode获取检测检验人员列表")
+    public ResponseModel<List<TzsUserInfo>> getUserInfosByUnitCode(@RequestParam String unitCode) {
+        return ResponseHelper.buildResponse(commonserviceImpl.getUserInfosByUnitCode(unitCode));
+    }
 
+    /**
+     * 查询检验检测机构列表（基本信息及联系人）
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getInspectionUnitList")
+    @ApiOperation(httpMethod = "GET", value = "查询检验检测机构列表（基本信息及联系人）", notes = "查询检验检测机构列表（基本信息及联系人）")
+    public ResponseModel<List<TzBaseEnterpriseInfo>> getInspectionUnitList() {
+        return ResponseHelper.buildResponse(commonserviceImpl.getInspectionUnitList());
+    }
 }

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

@@ -18,8 +18,6 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-14
  */
@@ -37,28 +35,28 @@ public class JyjcInspectionResultController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JyjcInspectionResultModel> save(@RequestBody JyjcInspectionResultModel model) {
-	    model = jyjcInspectionResultServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<JyjcInspectionResultModel> save(@RequestBody JyjcInspectionResultModel model) {
+        model = jyjcInspectionResultServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
 
-	/**
+    /**
      * 根据sequenceNbr更新
      *
      * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<JyjcInspectionResultModel> updateBySequenceNbrJyjcInspectionResult(@RequestBody JyjcInspectionResultModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateWithModel(model));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+    public ResponseModel<JyjcInspectionResultModel> updateBySequenceNbrJyjcInspectionResult(@RequestBody JyjcInspectionResultModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateWithModel(model));
+    }
 
-	/**
+    /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
@@ -67,75 +65,76 @@ public class JyjcInspectionResultController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.removeById(sequenceNbr));
     }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+     * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<Map<String, Object>> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryDetailBySeq(sequenceNbr));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
+    public ResponseModel<Map<String, Object>> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryDetailBySeq(sequenceNbr));
+    }
 
 
-	/**
-	 * 列表全部数据查询
+    /**
+     * 列表全部数据查询
      *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<JyjcInspectionResultModel>> selectForList() {
-	    return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultList());
-	}
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<JyjcInspectionResultModel>> selectForList() {
+        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultList());
+    }
 
-	/**
-	 * 列表页面(报检单位）
-	 *
-	 * @param current 当前页
-	 * @param size    当前页大小
-	 * @param model   查询参数
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/applicationUnitPage")
-	@ApiOperation(httpMethod = "GET", value = "列表页面(报检单位）", notes = "列表页面(报检单位）")
-	public ResponseModel<Page<JyjcInspectionResultModel>> applicationUnitQueryForPage(
-			@RequestParam(value = "current") int current,
-			@RequestParam(value = "size") int size, JyjcInspectionResultModel model) {
-		Page<JyjcInspectionResultModel> page = new Page<>();
-		page.setCurrent(current);
-		page.setSize(size);
-		return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultPage(page, model, false));
-	}
+    /**
+     * 列表页面(报检单位）
+     *
+     * @param current 当前页
+     * @param size    当前页大小
+     * @param model   查询参数
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/applicationUnitPage")
+    @ApiOperation(httpMethod = "Post", value = "列表页面(报检单位）", notes = "列表页面(报检单位）")
+    public ResponseModel<Page<JyjcInspectionResultModel>> applicationUnitQueryForPage(
+            @RequestParam int current, @RequestParam int size,
+            @RequestBody JyjcInspectionResultModel model) {
+        Page<JyjcInspectionResultModel> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultPage(page, model, false));
+    }
+
+    /**
+     * 列表页面(检验检测单位）
+     *
+     * @param current 当前页
+     * @param size    当前页大小
+     * @param model   查询参数
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/inspectionUnitPage")
+    @ApiOperation(httpMethod = "POST", value = "列表页面(检验检测单位）", notes = "列表页面(检验检测单位）")
+    public ResponseModel<Page<JyjcInspectionResultModel>> inspectionUnitQueryForPage(
+            @RequestParam int current, @RequestParam int size,
+            @RequestBody JyjcInspectionResultModel model) {
+        Page<JyjcInspectionResultModel> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultPage(page, model, true));
+    }
 
-	/**
-	 * 列表页面(检验检测单位）
-	 *
-	 * @param current 当前页
-	 * @param size    当前页大小
-	 * @param model   查询参数
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/inspectionUnitPage")
-	@ApiOperation(httpMethod = "GET", value = "列表页面(检验检测单位）", notes = "列表页面(检验检测单位）")
-	public ResponseModel<Page<JyjcInspectionResultModel>> inspectionUnitQueryForPage(
-			@RequestParam(value = "current") int current,
-			@RequestParam(value = "size") int size, JyjcInspectionResultModel model) {
-		Page<JyjcInspectionResultModel> page = new Page<>();
-		page.setCurrent(current);
-		page.setSize(size);
-		return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultPage(page, model, true));
-	}
 
 	/**
 	 * 检验结果-上传结果和编辑结果
@@ -145,7 +144,21 @@ public class JyjcInspectionResultController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/updateResult")
 	@ApiOperation(httpMethod = "PUT", value = "检验结果-上传结果和编辑结果", notes = "检验结果-上传结果和编辑结果")
-	public ResponseModel<JyjcInspectionResultModel> updateJyjcInspectionResult(@RequestBody JyjcInspectionResultModel model) {
+    public ResponseModel<JyjcInspectionResultModel> updateJyjcInspectionResult(@RequestBody Map<String, Map<String, Object>> model) {
 		return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateJyjcInspectionResult(model));
 	}
+
+
+    /**
+     * 获取设备种类列表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "获取设备种类列表", notes = "获取设备种类列表")
+    @GetMapping(value = "/equipTypeList")
+    public ResponseModel<List<Map<String, Object>>> equipTypeList(@RequestParam(required = false) String type, @RequestParam(required = false) String notNode) {
+        return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.equipList(type, notNode));
+    }
+
 }

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

@@ -6,6 +6,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionResultParamServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -113,4 +115,16 @@ public class JyjcInspectionResultParamController extends BaseController {
 	public ResponseModel<List<JyjcInspectionResultParamModel>> selectForList() {
 	    return ResponseHelper.buildResponse(jyjcInspectionResultParamServiceImpl.queryForJyjcInspectionResultParamList());
 	}
+
+
+	/**
+	 * 获取某一类设备的技术参数
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "获取某一类设备的技术参数",   notes = "获取某一类设备的技术参数")
+	@GetMapping(value = "/getParamByEquipTypeCode")
+	public ResponseModel<List<Map<String,Object>>> getParamByEquipTypeCode(@RequestParam String equipTypeCode) {
+		return ResponseHelper.buildResponse(jyjcInspectionResultParamServiceImpl.getParamByEquipTypeCode(equipTypeCode));
+	}
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 import cn.hutool.core.map.MapBuilder;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -15,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.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,10 +27,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -97,6 +96,11 @@ public class JyjcOpeningApplicationController extends BaseController {
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+		JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationServiceImpl.getById(sequenceNbr);
+		List<String> status = Arrays.asList(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()),String.valueOf(FlowStatusEnum.REJECTED.getCode()));
+		if(status.contains(jyjcOpeningApplication.getStatus())){
+			throw new BadRequest("除撤回跟驳回的流程之外其余流程不可删除！");
+		}
         return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.removeById(sequenceNbr));
     }
 
@@ -110,7 +114,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@DeleteMapping(value = "batchDelete")
 	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
 	public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbrList") List<Long> sequenceNbrList){
-		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.deleteBatchSeq(sequenceNbrList));
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.deleteBatchByIds(sequenceNbrList));
 	}
 
     /**
@@ -201,8 +205,8 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回业务开通申请",   notes = "撤回业务开通申请")
 	@GetMapping(value = "/rollBackFlow")
-	public void overflow( @RequestParam("instanceId") String instanceId) {
-		jyjcOpeningApplicationServiceImpl.stopFlow(instanceId);
+	public void overflow( @RequestParam("sequenceNbr") String sequenceNbr) {
+		jyjcOpeningApplicationServiceImpl.stopFlow(sequenceNbr);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -26,6 +27,10 @@ public class CommonserviceImpl {
     @Autowired
     TzsUserInfoMapper userInfoMapper;
 
+    @Autowired
+    TzBaseEnterpriseInfoMapper enterpriseInfoMapper;
+
+    public static final String UNIT_TYPE = "检验检测机构";
 
     /**
      * @return ReginParams
@@ -43,4 +48,8 @@ public class CommonserviceImpl {
         List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
         return userInfos;
     }
+
+    public List<TzBaseEnterpriseInfo> getInspectionUnitList() {
+        return enterpriseInfoMapper.getInspectionUnitList(UNIT_TYPE);
+    }
 }

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

@@ -4,9 +4,13 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEqu
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationEquipService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+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.util.Collections;
 import java.util.List;
 
 /**
@@ -30,4 +34,13 @@ public class JyjcInspectionApplicationEquipServiceImpl extends BaseService<JyjcI
     public List<JyjcInspectionApplicationEquipModel> queryForJyjcInspectionApplicationEquipList()   {
         return this.queryForList("" , false);
     }
+
+    public List<JyjcInspectionApplicationEquipModel> listApplicationEquipByApplicationSeq(Long applicationSeq)   {
+        // this.queryForList 尽量不要重载方法
+        List<JyjcInspectionApplicationEquip> entitys = this.lambdaQuery().eq(JyjcInspectionApplicationEquip::getApplicationSeq, applicationSeq).list();
+        if (ValidationUtil.isEmpty(entitys)) {
+            return Collections.EMPTY_LIST;
+        }
+        return Bean.toModels(entitys, JyjcInspectionApplicationEquipModel.class);
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationPushLog;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationPushLogMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationPushLogService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationPushLogModel;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务实现类
@@ -30,4 +34,26 @@ public class JyjcInspectionApplicationPushLogServiceImpl extends BaseService<Jyj
     public List<JyjcInspectionApplicationPushLogModel> queryForJyjcInspectionApplicationPushLogList()   {
         return this.queryForList("" , false);
     }
+
+    /**
+     * 记录日志
+     *
+     *
+     * @param params params
+     * @return {@link  boolean}
+     * @author yangyang
+     * @throws
+     * @date 2023/12/15 15:53
+     */
+    public boolean saveInspectionApplicationPushLog(Map<String, Object> params) {
+        JyjcInspectionApplicationModel inspectionApplicationModel = (JyjcInspectionApplicationModel) params.get("inspectionApplication");
+        List<JyjcInspectionApplicationEquipModel> applicationEquipModels = (List<JyjcInspectionApplicationEquipModel>) params.get("applicationEquips");
+        JyjcInspectionApplicationPushLog logEntity = new JyjcInspectionApplicationPushLog();
+        logEntity.setApplicationSeq(inspectionApplicationModel.getSequenceNbr());
+        logEntity.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
+        logEntity.setPushData(JSON.toJSONString(applicationEquipModels));
+        logEntity.setPushStatus("0");
+        return this.save(logEntity);
+    }
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultParam;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultParamMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultParamService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultParamModel;
+import com.yeejoin.amos.boot.module.jyjc.biz.utils.JsonUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 检验结果技术参数表服务实现类
@@ -18,6 +26,10 @@ import java.util.List;
  */
 @Service
 public class JyjcInspectionResultParamServiceImpl extends BaseService<JyjcInspectionResultParamModel,JyjcInspectionResultParam,JyjcInspectionResultParamMapper> implements IJyjcInspectionResultParamService {
+
+    @Value("classpath:/json/equipParam.json")
+    private Resource equipParam;
+
     /**
      * 分页查询
      */
@@ -38,4 +50,14 @@ public class JyjcInspectionResultParamServiceImpl extends BaseService<JyjcInspec
         wrapper.eq(JyjcInspectionResultParam::getResultSeq, sequenceNbr);
         return this.baseMapper.selectList(wrapper);
     }
+
+    @Override
+    public List<Map<String, Object>> getParamByEquipTypeCode(String equipTypeCode) {
+        List<Map<String, Object>> paramList = new ArrayList<>();
+        Map<String, List<Map<String, Object>>> paramJson = JsonUtils.getResourceJson(equipParam);
+        if (StringUtil.isNotEmpty(equipTypeCode)) {
+            paramList = ObjectUtils.isEmpty(paramJson.get(equipTypeCode)) ? new ArrayList<>() : paramJson.get(equipTypeCode);
+        }
+        return paramList;
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 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.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultParam;
@@ -16,16 +17,22 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttachmentService;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultParamService;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultService;
+import com.yeejoin.amos.boot.module.jyjc.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -44,6 +51,12 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     private IJyjcInspectionResultParamService iJyjcInspectionResultParamService;
 
     @Autowired
+    EquipmentCategoryMapper equipmentCategoryMapper;
+
+    @Value("classpath:/json/equipCategory.json")
+    private Resource equipCategory;
+
+    @Autowired
     JyjcInspectionResultMapper resultMapper;
 
     @Autowired
@@ -59,6 +72,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     public Page<JyjcInspectionResultModel> queryForJyjcInspectionResultPage(Page<JyjcInspectionResultModel> page, JyjcInspectionResultModel model, boolean type) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),
                 RequestContext.getToken())).toString(), ReginParams.class);
+        if (ObjectUtils.isEmpty(model)) {
+            model = new JyjcInspectionResultModel();
+        }
         if (type) {
             //检验检测单位分页查询
             model.setInspectionUnitCode(reginParams.getCompany().getCompanyCode());
@@ -77,12 +93,32 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     }
 
 
-    public JyjcInspectionResultModel updateJyjcInspectionResult(JyjcInspectionResultModel model) {
+    public JyjcInspectionResultModel updateJyjcInspectionResult(Map<String, Map<String, Object>> tableModel) {
+
+        Map<String, Object> map = tableModel.get("inspectResult");
+        JyjcInspectionResultModel model = BeanUtil.mapToBean(map, JyjcInspectionResultModel.class, true);
         updateWithModel(model);
-        if (ObjectUtil.isNotEmpty(model.getResultAttachmentModel()))
-            attachmentService.createWithModel(model.getResultAttachmentModel());
-        if (ObjectUtil.isNotEmpty(model.getResultParamModel()))
-            resultParamService.createWithModel(model.getResultParamModel());
+
+        List<JyjcInspectionResultAttachment> attachmentList = new ArrayList<>();
+        map.forEach((k, v) -> {
+            if (k.contains("JYJC_") && !ObjectUtils.isEmpty(map.get(k))) {
+                JyjcInspectionResultAttachment attachment = new JyjcInspectionResultAttachment();
+                attachment.setResultSeq(model.getSequenceNbr());
+                attachment.setAttachmentUrl(JSON.toJSONString(map.get(k)));
+                attachment.setAttachmentType(k);
+                attachmentList.add(attachment);
+            }
+        });
+        if (!CollectionUtils.isEmpty(attachmentList)) {
+            attachmentService.saveBatch(attachmentList);
+        }
+
+        if (!CollectionUtils.isEmpty(model.getResultParamModelMap())){
+            JyjcInspectionResultParam resultParam = new JyjcInspectionResultParam();
+            resultParam.setResultSeq(model.getSequenceNbr());
+            resultParam.setParamJson(JSON.toJSONString(model.getResultParamModelMap()));
+            resultParamService.save(resultParam);
+        }
         return model;
     }
 
@@ -105,7 +141,12 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             // 获取附件
             List<JyjcInspectionResultAttachment> attachmentList = iJyjcInspectionResultAttachmentService.getObjByResultSeq(sequenceNbr);
             if (!CollectionUtils.isEmpty(attachmentList)) {
-                Map<String, Object> attachmentMap = attachmentList.stream().collect(Collectors.toMap(JyjcInspectionResultAttachment::getAttachmentType, JyjcInspectionResultAttachment::getAttachmentUrl));
+                Map<String, Object> attachmentMap = attachmentList.stream().map(obj -> {
+                    if (StringUtil.isNotEmpty(obj.getAttachmentUrl())) {
+                        obj.setAttachmentUrlList(JSONArray.parseArray(obj.getAttachmentUrl()));
+                    }
+                    return obj;
+                }).collect(Collectors.toMap(JyjcInspectionResultAttachment::getAttachmentType, JyjcInspectionResultAttachment::getAttachmentUrlList));
                 map.putAll(attachmentMap);
             }
 
@@ -121,6 +162,36 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                 map.put("paramJson", mapParam);
             }
         }
-        return map;
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("inspectResult", map);
+        return resultMap;
+    }
+
+    @Override
+    public List<Map<String, Object>> equipList(String type, String notNode) {
+        List<Map<String, Object>> menus = new ArrayList<>();
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
+        List<Map<String, Object>> mapList;
+        if (ValidationUtil.isEmpty(type)) {
+            mapList = resourceJson.get(EquipmentClassifityEnum.BDLS.getCode());
+        } else {
+            mapList = resourceJson.get(type);
+        }
+
+        mapList.stream().filter(map -> {
+            if (!ObjectUtils.isEmpty(notNode)) {
+                String[] code = notNode.split(",");
+                List<String> codeList = Arrays.asList(code);
+                return !codeList.contains(map.get("code"));
+            }
+            return true;
+        }).forEach(obj -> {
+            Map<String, Object> resultMap = new HashMap<>(2);
+            resultMap.put("instanceName", obj.get("name"));
+            resultMap.put("instanceId", obj.get("code"));
+            menus.add(resultMap);
+        });
+
+        return menus;
     }
 }
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jyjc.biz.feign.WorkflowFeignClient;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.workflow.model.AjaxResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.LinkedHashMap;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * ProjectName: amos-boot-biz
+ * PackageName: com.yeejoin.amos.boot.module.jyjc.biz.service.impl
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/12/15 15:46
+ */
+@Component
+@Slf4j
+public class WorkflowHelper {
+
+    @Autowired
+    private WorkflowFeignClient workflowFeignClient;
+
+    /**
+     * 获取工作流
+     *
+     *
+     * @param instanceId instanceId
+     * @return {@link  JSONObject}
+     * @author yangyang
+     * @throws
+     * @date 2023/12/15 16:17
+     */
+    public JSONObject getTask(String instanceId) {
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+        String taskId = dataObject.getString("id");// 工作流ID
+        FeignClientResult<JSONObject> nodeInfo = workflowFeignClient.getNodeInfotoken(RequestContext.getAppKey(), RequestContext.getProduct(), RequestContext.getToken(), taskId);
+        dataObject.put("nodeInfo", nodeInfo.getResult());
+        return dataObject;
+    }
+
+    public String getWorkflowStatus(JSONObject dataObject) {
+        return !ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "";
+    }
+
+    public String getWorkflowRoleGroups(JSONObject dataObject) {
+        JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
+        if(!ValidationUtil.isEmpty(executorArray)) {
+            return executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
+        }
+        return null;
+    }
+}

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/handler/AbstractJyjcInspectionApplicationHandlerServiceImpl.java

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler;
+
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationHandlerService;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationPushLogServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * ProjectName: amos-boot-biz
+ * PackageName: com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/12/15 16:12
+ */
+@Component
+public class AbstractJyjcInspectionApplicationHandlerServiceImpl implements IJyjcInspectionApplicationHandlerService {
+
+    @Autowired
+    private JyjcInspectionApplicationPushLogServiceImpl applicationPushLogService;
+
+    @Override
+    public String type() {
+        return "default";
+    }
+
+    @Override
+    public boolean notifyInspectionUnit(Map<String, Object> params) {
+        // push日志
+        applicationPushLogService.saveInspectionApplicationPushLog(params);
+        return 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/handler/DetectionInspectionApplicationHandlerServiceImpl.java

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler;
+
+import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 检测
+ * <p>
+ * ProjectName: amos-boot-biz
+ * PackageName: com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/12/15 16:32
+ */
+@Component
+public class DetectionInspectionApplicationHandlerServiceImpl extends AbstractJyjcInspectionApplicationHandlerServiceImpl {
+
+    @Override
+    public String type() {
+        return BizTypeEnum.DETECTION.getCode();
+    }
+
+    @Override
+    public boolean notifyInspectionUnit(Map<String, Object> params) {
+        super.notifyInspectionUnit(params);
+        // todo
+        return 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/handler/FirstInspectionApplicationHandlerServiceImpl.java

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler;
+
+import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 定检
+ * <p>
+ * ProjectName: amos-boot-biz
+ * PackageName: com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/12/15 16:32
+ */
+@Component
+public class FirstInspectionApplicationHandlerServiceImpl extends AbstractJyjcInspectionApplicationHandlerServiceImpl {
+
+    @Override
+    public String type() {
+        return BizTypeEnum.FIRST_INSPECTION.getCode();
+    }
+
+    @Override
+    public boolean notifyInspectionUnit(Map<String, Object> params) {
+        super.notifyInspectionUnit(params);
+        // todo
+        return 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/handler/JyjcInspectionApplicationHandlerFactory.java

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler;
+
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationHandlerService;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/11/8 15:10
+ */
+@Service
+public class JyjcInspectionApplicationHandlerFactory implements ApplicationContextAware {
+
+    private static final Map<String, IJyjcInspectionApplicationHandlerService> SERVICE_POOL = new HashMap<>(12);
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        applicationContext.getBeansOfType(IJyjcInspectionApplicationHandlerService.class).forEach((beanName, bean) -> SERVICE_POOL.put(bean.type(), bean));
+    }
+
+    public static IJyjcInspectionApplicationHandlerService apply(String type) {
+        IJyjcInspectionApplicationHandlerService objectSceneService = SERVICE_POOL.get(type);
+        if (Objects.isNull(objectSceneService)) {
+            throw new IllegalArgumentException("SERVICE_POOL type: " + type + " is not found !");
+        }
+        return objectSceneService;
+    }
+}

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/handler/SuperviseInspectionApplicationHandlerServiceImpl.java

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler;
+
+import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 监督检验
+ *
+ * <p>
+ * ProjectName: amos-boot-biz
+ * PackageName: com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler
+ *
+ * @author yangyang
+ * @version v1.0
+ * @date 2023/12/15 16:32
+ */
+@Component
+public class SuperviseInspectionApplicationHandlerServiceImpl extends AbstractJyjcInspectionApplicationHandlerServiceImpl {
+
+    @Override
+    public String type() {
+        return BizTypeEnum.SUPERVISE.getCode();
+    }
+
+    @Override
+    public boolean notifyInspectionUnit(Map<String, Object> params) {
+        super.notifyInspectionUnit(params);
+        // todo
+        return true;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/utils/JsonUtils.java

+package com.yeejoin.amos.boot.module.jyjc.biz.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.IOUtils;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+
+public class JsonUtils {
+    //将json文件转化为Map<list<Map<>>>
+    public static Map getResourceJson(Resource resource) {
+        String json = null;
+        try {
+            json = IOUtils.toString(resource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            throw new RuntimeException(resource + "json文件转化失败");
+        }
+        return JSONObject.parseObject(json, Map.class);
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equipCategory.json

+{
+  "eightCategory": [
+    {
+      "name": "电梯",
+      "code": "3000",
+      "image": "upload/tzs/common/image/总览电梯.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "elevator"
+    },
+    {
+      "name": "起重机械",
+      "code": "4000",
+      "image": "upload/tzs/common/image/总览起重机械.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "lifting"
+    },
+    {
+      "name": "场内机动车辆",
+      "code": "5000",
+      "image": "upload/tzs/common/image/总览厂车.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "vehicle"
+    },
+    {
+      "name": "锅炉",
+      "code": "1000",
+      "image": "upload/tzs/common/image/总览锅炉.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "boiler"
+    },
+    {
+      "name": "压力容器",
+      "code": "2000",
+      "image": "upload/tzs/common/image/总览压力容器.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "vessel"
+    },
+    {
+      "name": "压力管道",
+      "code": "8000",
+      "image": "upload/tzs/common/image/总览压力管道.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "pipeline"
+    },
+    {
+      "name": "大型游乐设施",
+      "code": "6000",
+      "image": "upload/tzs/common/image/总览游乐设施.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "rides"
+    },
+    {
+      "name": "客运索道",
+      "code": "9000",
+      "image": "upload/tzs/common/image/总览索道.png",
+      "waitClaim": "0",
+      "alreadyClaim": "0",
+      "refuseClaim": "0",
+      "sum": "0",
+      "type": "ropeway"
+    }
+  ],
+  "other": [
+    {
+      "name": "电梯",
+      "code": "3000"
+    },
+    {
+      "name": "起重机械",
+      "code": "4000"
+    },
+    {
+      "name": "场内机动车辆",
+      "code": "5000"
+    },
+    {
+      "name": "锅炉",
+      "code": "1000"
+    },
+    {
+      "name": "压力容器",
+      "code": "2000"
+    },
+    {
+      "name": "压力管道",
+      "code": "8000"
+    },
+    {
+      "name": "大型游乐设施",
+      "code": "6000"
+    },
+    {
+      "name": "客运索道",
+      "code": "9000"
+    }
+  ]
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equipParam.json

+{
+  "3000": [
+    {
+      "label": "使用年限",
+      "key": "synx",
+      "type": "input"
+    },
+    {
+      "label": "控制方式",
+      "key": "kzfs",
+      "type": "select",
+      "data": [
+        {
+          "name": "选项1",
+          "value": "1"
+        },
+        {
+          "name": "选项1",
+          "value": "1"
+        }
+      ]
+    }
+  ],
+  "4000": [
+    {
+      "label": "使用年限4000",
+      "key": "synx",
+      "type": "input"
+    }
+  ]
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/PersonManageRoleEnum.java

+package com.yeejoin.amos.boot.module.tcm.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum PersonManageRoleEnum {
+    /**
+     * 人员管理角色枚举
+     */
+    code("人员管理角色字典code", 6616L),
+
+    use("使用单位", 1735591519093547010L),
+    agw("安装改造维修单位", 1735591458058035201L),
+    jyjc("检验检测机构", 1735590873120399362L);
+
+    String name;
+    Long id;
+
+    public static Map<Long, String> getName = new HashMap<>();
+    public static Map<String, Long> getId = new HashMap<>();
+
+    static {
+        for (PersonManageRoleEnum e : PersonManageRoleEnum.values()) {
+            getName.put(e.id, e.name);
+            getId.put(e.name, e.id);
+        }
+
+    }
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserInfoMapper.java

@@ -31,4 +31,8 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
     List<GroupAndPersonInfoDto> getUnitInfoByUserId(Long groupId);
 
     String selectPostNameByUserId(String userId);
+
+    List<Map<String, Object>> getUserTypeList(@Param(value = "typeList") List<String> typeList);
+
+    String selectCompanyTypeById(Long companySeq);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -211,4 +211,21 @@
     <select id="selectPostNameByUserId" resultType="java.lang.String">
         SELECT post_name  FROM "tzs_user_info" WHERE amos_user_id = #{userId}
     </select>
+
+    <select id="getUserTypeList" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+            "cb_data_dictionary"
+        WHERE
+            type in
+        <foreach collection="typeList" separator="," item="type" open="(" close=")">
+            #{type}
+        </foreach>
+
+    </select>
+
+    <select id="selectCompanyTypeById" resultType="java.lang.String">
+        select company_type from privilege_company where sequence_nbr = #{companySeq}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -82,7 +83,7 @@ public class TzsUserInfoController extends BaseController {
         if (ObjectUtils.isEmpty(reginParams)) {
             return null;
         }
-        CompanyModel companyModel = reginParams.getUserModel().getCompanys().get(0);
+        CompanyBo companyModel = reginParams.getCompany();
         if(ObjectUtils.isEmpty(companyModel)){
             throw new BadRequest("未指定人员归属单位信息");
         }
@@ -218,11 +219,11 @@ public class TzsUserInfoController extends BaseController {
         if (ObjectUtils.isEmpty(reginParams)) {
             return null;
         }
-        CompanyModel companyModel = reginParams.getUserModel().getCompanys().get(0);
-        if(ObjectUtils.isEmpty(companyModel)){
+        CompanyBo company = reginParams.getCompany();
+        if(ObjectUtils.isEmpty(company)){
             throw new BadRequest("未指定人员归属单位信息");
         }
-        dto.setUnitCode(companyModel.getCompanyCode());
+        dto.setUnitCode(company.getCompanyCode());
         Page<TzsUserInfoDto> page = new Page<>();
         page.setCurrent(Long.parseLong(current));
         page.setSize(Long.parseLong(size));

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -15,6 +16,7 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.*;
 import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
+import com.yeejoin.amos.boot.module.tcm.api.enums.PersonManageRoleEnum;
 import com.yeejoin.amos.boot.module.tcm.api.enums.TwoStipulateGroupEnum;
 import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserEquipMapper;
@@ -262,6 +264,22 @@ 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);
+                if(companyType.contains(PersonManageRoleEnum.jyjc.getName())){
+                    roleIds.add(PersonManageRoleEnum.jyjc.getId());
+                }
+                if(companyType.contains(PersonManageRoleEnum.use.getName())){
+                    roleIds.add(PersonManageRoleEnum.use.getId());
+                }
+                if(companyType.contains(PersonManageRoleEnum.agw.getName())){
+                    roleIds.add(PersonManageRoleEnum.agw.getId());
+                }
+            }
+
             Map<Long, List<Long>> roleSeqMap = new HashMap<>();
             Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
             roleSeqMap.put(companySeq, roleIds);
@@ -271,7 +289,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             agencyUserModel.setOrgRoleSeqs(roleSeqMap);
             userResult = Privilege.agencyUserClient.create(agencyUserModel);
             if (userResult.getStatus() == 200) {
-                TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(sequenceNbr);
+
                 tzsUserInfo.setAmosUserId(userResult.getResult().getUserId());
                 tzsUserInfo.setAmosUserName(userResult.getResult().getUserName());
                 tzsUserInfo.setLockStatus(status);
@@ -284,7 +302,6 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                     Privilege.groupUserClient.create(Long.valueOf(roleGroup.getExtend()), userIds);
                 }
                 //绑定两个规定用户组
-                String post = tzsUserInfo.getPost();
                 post = post.replace("[", "").replace("]", "").replace("\"", "");
                 for (String code : post.split(",")) {
                     DataDictionary groupId = iDataDictionaryService
@@ -366,6 +383,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         boolean productCompany = false;
         boolean useCompany = false;
         boolean installCompany = false;
+        boolean inspectionCompany = false;
         for (CompanyModel companyModel : companyModels) {
             String companyType = companyModel.getCompanyType();
             if (companyType.contains("使用单位") || companyType.contains("个人主体")) {
@@ -377,19 +395,23 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             if (companyType.contains("安装改造维修单位")){
                 installCompany = true;
             }
+            if (companyType.contains("检验检测机构")){
+                inspectionCompany = true;
+            }
         }
-        String companyType = null;
+        StringBuilder companyType = new StringBuilder();
         if (useCompany) {
-            companyType = "use";
+            companyType.append("use-");
         }
         if (productCompany) {
-            companyType = "pro";
-        }
-        if (useCompany && productCompany) {
-            companyType = "useAndPro";
+            companyType.append("pro-");
         }
+
         if (installCompany) {
-            companyType = companyType + "AndInstall";
+            companyType.append("install-");
+        }
+        if (inspectionCompany) {
+            companyType.append("inspection");
         }
         result.put("companyType", companyType);
         return result;
@@ -526,18 +548,21 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
 
     @Override
     public List<Map<String, Object>> getUserType(String unitType) {
-        if (unitType.equals("pro")) {
-            return tzsUserInfoMapper.getUserType("QYRYGW-SCDW", null);
-        } else if (unitType.equals("use")) {
-            return tzsUserInfoMapper.getUserType("QYRYGW-SYDW", null);
-        } else if (unitType.equals("useAndInstall")){
-            return tzsUserInfoMapper.getUserType("QYRYGW-SYDW", "QYRYGW-INSTALL");
-        }  else if (unitType.equals("proAndInstall")){
-            return tzsUserInfoMapper.getUserType("QYRYGW-SCDW", "QYRYGW-INSTALL");
-        }else {
-            return tzsUserInfoMapper.getUserType(null, null);
+        List<String> type = new ArrayList<>();
+        type.add("QYRYGW");
+        if (unitType.contains("use")) {
+            type.add("QYRYGW-SYDW");
         }
-
+        if (unitType.contains("pro")) {
+            type.add("QYRYGW-SCDW");
+        }
+        if (unitType.contains("install")) {
+            type.add("QYRYGW-INSTALL");
+        }
+        if (unitType.contains("inspection")) {
+            type.add("QYRYGW-INSPECTION");
+        }
+        return tzsUserInfoMapper.getUserTypeList(type);
     }
 
     public List<LinkedHashMap> screenData(List<LinkedHashMap> result, List<LinkedHashMap> data, String id) {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -16,6 +16,7 @@ public enum ApplicationFormTypeEnum {
      */
     GZ("GZ"),
     JY("JY"),
+    JG("JG"),// 检验结果
     WB("WB"),
     SY("SY");
 

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

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
 
 /**
  * 企业数据信息 Mapper 接口
@@ -44,4 +45,11 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 
 	IPage<TzBaseEnterpriseInfoDto> pageList(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto, List orgCodeList);
+
+
+	/**
+	 * 查找企业关联设备详情列表
+	 *
+	 */
+	List<TzBaseEnterpriseInfo> getInspectionUnitList(@Param("unitType") String unitType);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -85,7 +85,12 @@
                USE_PLACE,
                ADDRESS,
                EQU_STATE,
-               STATUS
+               STATUS,
+               USE_INNER_CODE,
+               FACTORY_NUM,
+               PRODUCE_UNIT_NAME,
+               INSPECT_REPORT,
+               NEXT_INSPECT_DATE
         from idx_biz_view_jg_all
         WHERE SEQUENCE_NBR = #{id}
     </select>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -49,7 +49,7 @@
 			</if>
 			<if
 				test="tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' ">
-				AND use_unit LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useUnit},'%') 
+				AND use_unit LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useUnit},'%')
 			</if>
 			<if
 				test="tzBaseEnterpriseInfoDto.useUnitCertificate!=null and tzBaseEnterpriseInfoDto.useUnitCertificate!='' ">
@@ -57,7 +57,7 @@
 			</if>
 			<if
 				test="tzBaseEnterpriseInfoDto.useCode!=null and tzBaseEnterpriseInfoDto.useCode!='' ">
-				AND use_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useCode},'%') 
+				AND use_code LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useCode},'%')
 			</if>
 			<if
 				test="tzBaseEnterpriseInfoDto.region!=null and tzBaseEnterpriseInfoDto.region!='' ">
@@ -65,11 +65,11 @@
 			</if>
 			<if
 				test="tzBaseEnterpriseInfoDto.legalPerson!=null and tzBaseEnterpriseInfoDto.legalPerson!='' ">
-				AND legal_person LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPerson},'%') 
+				AND legal_person LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPerson},'%')
 			</if>
 			<if
 				test="tzBaseEnterpriseInfoDto.legalPhone!=null and tzBaseEnterpriseInfoDto.legalPhone!='' ">
-				AND legal_phone LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPhone},'%') 
+				AND legal_phone LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.legalPhone},'%')
 			</if>
 		  <if
 				  test="tzBaseEnterpriseInfoDto.superviseOrgCode!=null and tzBaseEnterpriseInfoDto.superviseOrgCode!='' ">
@@ -154,5 +154,10 @@
 	<select id="selectByUseUnit" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo">
 		select * from tz_base_enterprise_info where use_unit = #{useUnit}
 	</select>
+	<select id="getInspectionUnitList" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo">
+		select sequence_nbr,use_code,use_unit,use_contact,contact_phone
+		from tz_base_enterprise_info
+		where unit_type LIKE CONCAT('%',#{unitType},'%')
+	</select>
 
 </mapper>

pom.xml

@@ -27,7 +27,7 @@
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<tyboot-version>1.1.23-SNAPSHOT</tyboot-version>
-		<amos.version>1.7.10-SNAPSHOT</amos.version>
+		<amos.version>1.8.6</amos.version>
 		<itext.version>7.1.1</itext.version>
 		<elasticsearch.version>7.15.2</elasticsearch.version>
 	</properties>