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

@@ -201,6 +201,9 @@ 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)

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

@@ -224,118 +224,124 @@ public class JgInstallationNotice extends BaseEntity {
     /**
      * 撤销说明
      */
-	@TableField("cancel_remark")
+    @TableField("cancel_remark")
     private String cancelRemark;
 
     /**
      * 撤销处理截止日期
      */
-	@TableField("cancel_handle_deadline")
+    @TableField("cancel_handle_deadline")
     private Date cancelHandleDeadline;
 
     /**
      * 撤销流水号
      */
-	@TableField("cancel_process_no")
+    @TableField("cancel_process_no")
     private String cancelProcessNo;
 
     /**
      * 施工合同是否本单位与甲方直接签署
      */
-	@TableField("is_signed_with_a")
+    @TableField("is_signed_with_a")
     private String isSignedWithA;
 
     /**
      * 检验单位代码
      */
-	@TableField("inspect_unit_id")
+    @TableField("inspect_unit_id")
     private String inspectUnitId;
 
     /**
      * 检验单位
      */
-	@TableField("inspect_unit_name")
+    @TableField("inspect_unit_name")
     private String inspectUnitName;
 
     /**
      * 是否已报检
      */
-	@TableField("is_inspected")
+    @TableField("is_inspected")
     private String isInspected;
 
     /**
      * 设备安装质量证明书编号
      */
-	@TableField("install_cert_no")
+    @TableField("install_cert_no")
     private String installCertNo;
 
     /**
      * 审核通过时间
      */
-	@TableField("receive_time")
+    @TableField("receive_time")
     private Date receiveTime;
 
     /**
      * 状态
      */
-	@TableField("status")
+    @TableField("status")
     private String status;
 
     /**
      * 备注
      */
-	@TableField("remark")
+    @TableField("remark")
     private String remark;
 
     /**
      * 创建人ID
      */
-	@TableField("create_user_id")
+    @TableField("create_user_id")
     private String createUserId;
 
     /**
      * 创建时间
      */
-	@TableField("create_date")
+    @TableField("create_date")
     private Date createDate;
 
     /**
      * 录入单位ID
      */
-	@TableField("input_unit_no")
+    @TableField("input_unit_no")
     private String inputUnitNo;
 
     /**
      * 安装委托书图片
      */
-	@TableField("proxy_statement_attachment")
+    @TableField("proxy_statement_attachment")
     private String proxyStatementAttachment;
 
     /**
      * 安装合同照片
      */
-	@TableField("install_contract_attachment")
+    @TableField("install_contract_attachment")
     private String installContractAttachment;
 
     /**
      * 是否西咸
      */
-	@TableField("is_xixian")
+    @TableField("is_xixian")
     private String isXixian;
 
     /**
      * 告知日期
      */
-	@TableField("notice_date")
+    @TableField("notice_date")
     private Date noticeDate;
 
     /**
      * 流程实例id
      */
-	@TableField("instance_id")
+    @TableField("instance_id")
     private String instanceId;
 
     /**
+     * 告知单PDF URL
+     */
+    @TableField("notice_report_url")
+    private String noticeReportUrl;
+
+    /**
      * 设备注册编码
      */
     @TableField("equ_register_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

@@ -49,6 +49,18 @@
     <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,
             ri.equ_list AS equList,
             ri.equ_category AS equCategory,
             ri.EQU_DEFINE AS equDefine,

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/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/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");
+        map = new HashMap<>(map);
+        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-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 org.springframework.data.repository.query.Param;
+
+import java.util.List;
 
 /**
  *  Mapper 接口
@@ -14,4 +18,6 @@ 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);
+
+   List<JyjcInspectionApplicationEquipModel> listByCategory(@Param("equipClassify") String equipClassify);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/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

@@ -96,23 +96,44 @@ 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 = "施工合同或证明")
+ private List<Map<String,Object>> sght;
+ @ApiModelProperty(value = "施工方案/施工设计文件")
+ private List<Map<String,Object>> sgfa;
+ @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(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 暂存")
-    private List<Map<String, Object>> sght;
-    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
-    private List<Map<String, Object>> sgfa;
-    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
-    private List<Map<String, Object>> sgdwxk;
-    @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/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;
 
 /**
@@ -10,4 +12,6 @@ import java.util.List;
  */
 public interface IJyjcInspectionApplicationService {
     void deleteBatchData(List<Long> sequenceNbr);
+
+    List<JyjcInspectionApplicationEquipModel> listByCategory(String equipClassify);
 }

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

@@ -7,9 +7,9 @@
         select
         tzjia.application_no,
         tzjia.inspection_type,
-        tzjia.inspection_classify,
+        (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,
-        tzjia.equip_classify,
+        (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,
@@ -59,4 +59,34 @@
         </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>
 </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-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
-import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
-import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
-import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationAttachment;
-import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationAttachmentModel;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationAttachmentServiceImpl;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl;
-import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationPushLogServiceImpl;
-import org.springframework.beans.BeanUtils;
-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.yeejoin.amos.boot.biz.common.controller.BaseController;
-
-import java.util.ArrayList;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import java.util.Map;
-
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationServiceImpl;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 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 static com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl.buildOrderNo;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 
@@ -136,10 +110,8 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<JyjcInspectionApplicationModel> selectOne(@PathVariable Long sequenceNbr) {
-		jyjcInspectionApplicationServiceImpl.selectBySeq(sequenceNbr);
-
-	    return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<Map<String,Object>> selectOne(@PathVariable Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.selectBySeq(sequenceNbr));
 	}
 
 	/**
@@ -263,4 +235,15 @@ public class JyjcInspectionApplicationController extends BaseController {
 	public void doRollbackFlow(@RequestParam("instanceId") String instanceId) {
 		jyjcInspectionApplicationServiceImpl.doRollback(instanceId);
 	}
+	/**
+	 * 查询指定设备种类的设备列表
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "查询指定设备种类的设备列表",   notes = "查询指定设备种类的设备列表")
+	@GetMapping(value = "/listByCategory")
+	public ResponseModel<List<JyjcInspectionApplicationEquipModel>> listByCategory(@RequestParam("equipClassify") String equipClassify) {
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(equipClassify));
+	}
 }

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
@@ -14,14 +14,10 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationAttachmentModel;
-import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
@@ -33,26 +29,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 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 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 java.util.ArrayList;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl.buildOrderNo;
-import java.util.Map;
-import java.util.Optional;
 
 /**
  * 服务实现类
@@ -190,6 +176,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     }
 
+    @Override
+    public List<JyjcInspectionApplicationEquipModel> listByCategory(String equipClassify) {
+        return getBaseMapper().listByCategory(equipClassify);
+    }
+
 
     public Page<JyjcInspectionApplication> queryForJyjcInspectionApplicationPage(Page<JyjcInspectionApplication> page,
                                                                                  String applicationNo,
@@ -215,9 +206,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         return this.queryForList("", false);
     }
 
-    public JyjcInspectionApplicationModel selectBySeq(Long sequenceNbr) {
-        JyjcInspectionApplicationModel model = this.selectBySeq(sequenceNbr);
-        return  model;
+    public Map<String,Object> selectBySeq(Long sequenceNbr) {
+        JyjcInspectionApplicationModel model = this.queryBySeq(sequenceNbr);
+        Map<String, Object> map = BeanUtil.beanToMap(model);
+        List<Map<String, Object>> dataByApplicationSeq = jyjcInspectionApplicationAttachmentService.getBaseMapper().getDataByApplicationSeq(sequenceNbr);
+        Map<String, Object> attMap = new HashMap<>();
+        for (Map<String, Object> maps : dataByApplicationSeq) {
+            attMap.put(maps.get("attachment_type").toString(),maps.get("attachment_url"));
+        }
+        map.putAll(attMap);
+        return  map;
     }
 
 

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

@@ -7,8 +7,6 @@ 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 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;
@@ -18,14 +16,9 @@ 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.api.model.JyjcInspectionResultModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.utils.JsonUtils;
-import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
-import com.yeejoin.amos.boot.module.ymt.flc.api.feign.PrivilegeFeginService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Value;
@@ -79,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());
@@ -141,7 +137,9 @@ 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

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

@@ -123,7 +123,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             if (model.getSequenceNbr() == null) {
                 CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
                 model.setUnitCode(companyBo.getCompanyCode());
-                model.setUnitCode("91611103MAC4Q1EG7B");
                 model.setUnitCodeName(companyBo.getCompanyName());
                 model.setApplicationSeq(createCodeService.createDeviceRegistrationCode(ApplicationFormTypeEnum.JY.getCode()));
                 return this.createWithModel(model);
@@ -228,7 +227,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
         }
         String unitCode = reginParams.getCompany().getCompanyCode();
-        unitCode = "91611103MAC4Q1EG7B"; // 测试用，之后务必删除！！！
+        // unitCode = "91611103MAC4Q1EG7B"; // 测试用，之后务必删除！！！
         QueryWrapper enterpriseInfoQueryWrapper = new QueryWrapper<>();
         enterpriseInfoQueryWrapper.eq("use_code", unitCode);
         TzBaseEnterpriseInfo baseUnitLicenceEntity = enterpriseInfoMapper.selectOne(enterpriseInfoQueryWrapper);
@@ -255,10 +254,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         // unitLicenceQueryWrapper.eq("licence_type", LicenceTypeEnum.JYJC.getCode());
         // List<TzBaseUnitLicenceDto> baseUnitLicences = Bean.toModels(unitLicenceMapper.selectList(unitLicenceQueryWrapper), TzBaseUnitLicenceDto.class );
         //
-        List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList(MapBuilder.<String, Object>create()
-                                                                                                     .put("unitCode", unitCode)
-                                                                                                     // .put("licenceType", LicenceTypeEnum.JYJC.getCode())
-                                                                                                     .build());
+        List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList(MapBuilder.<String, Object>create().put("unitCode", unitCode).put("licenceType", "jyjc").build());
         jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicences);
         // 获取检验人员信息
         QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
@@ -294,7 +290,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         dto.setBusinessKey(StringUtils.defaultString(businessKey, "1"));
         // dto.setCompleteFirstTask(true);
         FeignClientResult ajaxResult = Workflow.taskV2Client.startByVariable(dto);
-        // AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
+
         if (log.isDebugEnabled()) {
             log.debug("开启工作流结果：{}", ajaxResult);
         }