Merge branch 'develop_tzs_register' of…

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

@@ -200,6 +200,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

@@ -335,4 +335,10 @@ public class JgInstallationNotice extends BaseEntity {
     @TableField("instance_id")
     private String instanceId;
 
+    /**
+     * 告知单PDF URL
+     */
+    @TableField("notice_report_url")
+    private String noticeReportUrl;
+
 }

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,19 @@
     <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 AS province,
+            isn.city AS city,
+            isn.county AS county,
+            isn.street AS street,
+            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/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/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 = "检验检测单位编码")
@@ -77,7 +76,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "工作流实例ID")
     private String processInstanceId;
 
-   @ApiModelProperty(value = "工作流key")
+    @ApiModelProperty(value = "工作流key")
     private String processKey;
 
     @ApiModelProperty(value = "申请单二维码")
@@ -97,8 +96,7 @@ public class JyjcInspectionApplicationModel extends BaseModel {
 
     @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
     private String workflowNode;
-
-
+    
  @ApiModelProperty(value = "告知书")
  private List<Map<String,Object>> gzs;
  @ApiModelProperty(value = "产品质量证明书")
@@ -134,4 +132,8 @@ public class JyjcInspectionApplicationModel extends BaseModel {
  @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

@@ -31,6 +31,7 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "报检单位编号")
     private String applicationUnitCode;
 
+    //监管码
     @ApiModelProperty(value = "设备唯一标识")
     private String equipUnicode;
 
@@ -91,12 +92,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;
 

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

@@ -257,6 +257,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             resultModel.setApplicationNo(inspectionApplicationModel.getApplicationNo());
             resultModel.setApplicationUnitCode(inspectionApplicationModel.getApplicationUnitCode());
             resultModel.setResultStatus("未出");
+            resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
             // 解析设备
             resultModel.setBizType(inspectionApplicationModel.getBizType());
             resultModel.setResultNo(codes.get(i));
@@ -356,7 +357,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             return;
         }
         entity.setWorkflowRole(workflowHelper.getWorkflowRoleGroups(taskJson));
-        // entity.setWorkflowActiveKey(taskJson.getString("taskDefinitionKey"));
+        entity.setWorkflowNode(taskJson.getString("taskDefinitionKey"));
+        // entity.setWorkflowActiveKey();
         entity.setStatus(status);
         // entity.setStatusName(FlowStatusEnum.getNameByType(Long.parseLong(status)));
         this.updateById(entity);

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

@@ -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);
         }