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/workflow/feign/WorkflowFeignService.java

@@ -26,6 +26,11 @@ public interface WorkflowFeignService {
 	@RequestMapping(value = "/task/startProcess", method = RequestMethod.POST)
 	JSONObject startByVariable(@RequestBody Object params);
 
+
+	@RequestMapping(value = "/v2/task/startProcess ", method = RequestMethod.POST)
+	JSONObject startProcess(@RequestBody Object params);
+
+
 	/**
 	 * 以当前登录人作为任务完成人的完成任务操作
 	 *

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

@@ -164,10 +164,10 @@ public class JgInstallationNoticeDto extends BaseDto {
     private String inputUnitNo;
 
     @ApiModelProperty(value = "安装委托书图片")
-    private String proxyStatementAttachmentList;
+    private List<Map<String, Object>> proxyStatementAttachmentList;
 
     @ApiModelProperty(value = "安装合同照片")
-    private String installContractAttachmentList;
+    private List<Map<String, Object>> installContractAttachmentList;
 
     @ApiModelProperty(value = "安装委托书图片")
     private String proxyStatementAttachment;

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

@@ -8,6 +8,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author system_generator

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 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.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
@@ -11,6 +12,7 @@ import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
+import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -282,8 +284,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     private void convertField(JgInstallationNoticeDto model) {
         // 处理图片
-        model.setProxyStatementAttachment(model.getProxyStatementAttachmentList());
-        model.setInstallContractAttachment(model.getInstallContractAttachmentList());
+        model.setProxyStatementAttachment(JSON.toJSONString(model.getProxyStatementAttachmentList()));
+        model.setInstallContractAttachment(JSON.toJSONString(model.getInstallContractAttachmentList()));
 
         // 分割省市区字段
         String province = model.getProvince();

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,6 +2,7 @@ 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;
@@ -154,4 +155,9 @@ public class JyjcInspectionApplication extends BaseEntity {
 	@TableField("biz_type")
     private String bizType;
 
+	@TableField("workflow_node")
+    private String workflowNode;
+
+
+
 }

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;
@@ -137,4 +138,21 @@ public class JyjcInspectionResult extends BaseEntity {
 	@TableField("biz_type")
     private String bizType;
 
+    /**
+     * 设备类别
+     */
+    @TableField("equ_category")
+    private String equCategory;
+
+    /**
+     * 检验检测类型编码
+     */
+    @TableField("inspection_type")
+    private String inspectionType;
+
+    /**
+     * 检验检测类型名称（冗余）
+     */
+    @TableField("inspection_type_name")
+    private String inspectionTypeName;
 }

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

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@AllArgsConstructor
+@Getter
+public enum DocumentEnum {
+
+
+    GZS("gzs", "告知书"),
+    CPZL("cpzl", "产品质量证明书"),
+    SGZX("sgzx", "施工自行检查报告"),
+    SGHT("sght", "施工合同或证明"),
+    SGFA("sgfa", "施工方案/施工设计文件"),
+    SGDWXK("sgdwxk", "施工单位许可证书"),
+    XSSY("xssy", "型式试验证书"),
+    XSQTS("xsqts", "限速器和渐进式安全钳的调试证书"),
+    TJSM("tjsm", "土建声明"),
+    ZLBZ("zlbz", "质量保证手册和程序文件"),
+    SGZY("sgzy", "施工作业文件"),
+    SGRY("sgry", "施工人员、质量保证体系责任人、专业技术人员身份证、技术工人的身份证及资质证书"),
+    SGSJ("sgsj", "施工设计文件"),
+    SGFB("sgfb", "施工分包方目录"),
+    FBSPJ("fbspj", "分包方评价资料"),
+    QT("qt", "其他附件");
+
+    private String code;
+    private String name;
+
+    public static List<String> getEnumNameList() {
+        List<String> codeList = new ArrayList<String>();
+        for (DocumentEnum c: DocumentEnum.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/enums/FlowStatusEnum.java

@@ -25,7 +25,12 @@ public enum  FlowStatusEnum {
     /**
      * 已驳回
      */
-    REJECTED(6614, "已驳回");
+    REJECTED(6614, "已驳回"),
+
+    /**
+     * 已撤回
+     */
+    ROLLBACK(6615, "已撤回");
 
     private final int 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/ResultStatusEnum.java

+package com.yeejoin.amos.boot.module.jyjc.api.enums;
+
+public enum ResultStatusEnum {
+
+    NO_RESULT("未出","1"),
+    YES_RESULT("已出","2");
+    private String name;
+
+
+    private String code;
+
+    public String getName() {
+        return name;
+    }
+    ResultStatusEnum(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/mapper/JyjcInspectionApplicationAttachmentMapper.java

@@ -11,4 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JyjcInspectionApplicationAttachmentMapper extends BaseMapper<JyjcInspectionApplicationAttachment> {
 
+   public void deleteByApplicationSeq(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/JyjcInspectionApplicationEquipMapper.java

@@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-12-14
  */
 public interface JyjcInspectionApplicationEquipMapper extends BaseMapper<JyjcInspectionApplicationEquip> {
-
+    public void deleteByApplicationSeq(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.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -11,4 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspectionApplication> {
 
+
+   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);
 }

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

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
-import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 业务开通申请表 Mapper 接口
@@ -11,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JyjcInspectionResultMapper extends BaseMapper<JyjcInspectionResult> {
 
+    Page<JyjcInspectionResultModel> selectJyjcInspectionResultpPage(@Param("page") Page<JyjcInspectionResultModel> page, @Param("jyjcInspectionResultModel") JyjcInspectionResultModel jyjcInspectionResultModel);
+
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -15,6 +16,6 @@ import org.apache.ibatis.annotations.Param;
 public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningApplication> {
 
     Page<JyjcOpeningApplicationModel> selectJyjcOpeningApplicationList(@Param("page")Page<JyjcOpeningApplication> page,
-                                                                     @Param("jyjcOpeningApplicationModel") JyjcOpeningApplicationModel jyjcOpeningApplicationModel);
+                                                                       @Param("jyjcOpeningApplicationRequstDto") JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto, @Param("applyStartTime") String applyStartTime, @Param("applyendTime") String applyendTime);
 
 }

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

@@ -6,6 +6,8 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 
@@ -75,6 +77,9 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "工作流实例ID")
     private String processInstanceId;
 
+   @ApiModelProperty(value = "工作流key")
+    private String processKey;
+
     @ApiModelProperty(value = "申请单二维码")
     private String applicationQrcode;
 
@@ -87,4 +92,26 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "业务类型（与菜单对应拆表使用）")
     private String bizType;
 
+    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
+    private String operationType;
+
+    @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 暂存")
+ 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;
+
 }

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

@@ -2,9 +2,9 @@ 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;
 
@@ -16,10 +16,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JyjcInspectionResultModel", description="业务开通申请表")
+@ApiModel(value = "JyjcInspectionResultModel", description = "业务开通申请表")
 public class JyjcInspectionResultModel extends BaseModel {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "检验检测单位编码")
@@ -34,9 +34,12 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "设备唯一标识")
     private String equipUnicode;
 
-    @ApiModelProperty(value = "检验结果状态（已出、未出）")
+    @ApiModelProperty(value = "检验结果状态（已出2、未出1）")
     private String resultStatus;
 
+    @ApiModelProperty(value = "检验结果状态名称（已出2、未出1）（冗余）")
+    private String resultStatusName;
+
     @ApiModelProperty(value = "核准证号/许可证号")
     private String licenseNumber;
 
@@ -79,4 +82,46 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "业务类型（与菜单对应拆表使用）")
     private String bizType;
 
+    @ApiModelProperty(value = "设备类别")
+    private String equCategory;
+
+    @ApiModelProperty(value = "检验检测类型编码")
+    private String inspectionType;
+
+    @ApiModelProperty(value = "检验检测类型名称（冗余）")
+    private String inspectionTypeName;
+
+    @ApiModelProperty(value = "设备种类")
+    private String equList;
+
+    @ApiModelProperty(value = "监管码")
+    private String supervisoryCode;
+
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useOrgCode;
+
+    @ApiModelProperty(value = "单位内部编号")
+    private String useInnerCode;
+
+    @ApiModelProperty(value = "注册代码")
+    private String equCode;
+
+    /**
+     *  设备使用地点 = 设备使用地点省（province_name）+设备使用地点市（city_name）+
+     *  设备使用地点区（county_name）+设备使用地点街道（street_name）+设备使用地点详细（address）
+     */
+    @ApiModelProperty(value = "设备使用地点")
+    private String equAddress;
+
+    @ApiModelProperty(value = "使用单位")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "检验结果技术参数")
+    private JyjcInspectionResultParamModel resultParamModel;
+
+    @ApiModelProperty(value = "检验结果附件")
+    private JyjcInspectionResultAttachmentModel resultAttachmentModel;
 }

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

+package com.yeejoin.amos.boot.module.jyjc.api.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+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;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+@Data
+public class JyjcOpeningApplicationRequstDto {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位编码")
+    private String unitCode;
+
+    @ApiModelProperty (value = "单位编码Name")
+    private String unitCodeName;
+
+    @ApiModelProperty (value = "检测区域名称（冗余）")
+    private String detectionRegionName;
+
+    @ApiModelProperty (value = "申请单号")
+    private String applicationSeq;
+
+    @ApiModelProperty (value = "检验结果方式")
+    private String resultType;
+
+    @ApiModelProperty (value = "有效期至")
+    private String expiryDate;
+
+    @ApiModelProperty (value = "受理日期（接收日期）")
+    private String acceptDate;
+
+    @ApiModelProperty (value = "状态")
+    private String status;
+
+    @ApiModelProperty (value = "状态Name")
+    private String statusName;
+
+    @ApiModelProperty (value = "申请时间")
+    private String applyTime;
+
+
+
+}

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

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationAttachment;
+
 /**
  * 接口类
  *
  * @author system_generator
  * @date 2023-12-14
  */
-public interface IJyjcInspectionApplicationAttachmentService {}
+public interface IJyjcInspectionApplicationAttachmentService extends IService<JyjcInspectionApplicationAttachment> {}

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

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
 
@@ -13,7 +11,7 @@ import java.util.List;
  * @author system_generator
  * @date 2023-12-14
  */
-public interface IJyjcInspectionResultAttachmentService {
+public interface IJyjcInspectionResultAttachmentService   extends IService<JyjcInspectionResultAttachment> {
 
     /**
      * 根据结果表主键获取附件列表

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

 package com.yeejoin.amos.boot.module.jyjc.api.service;
 
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultParam;
+
+import java.util.List;
+
 /**
  * 检验结果技术参数表接口类
  *
  * @author system_generator
  * @date 2023-12-14
  */
-public interface IJyjcInspectionResultParamService {}
+public interface IJyjcInspectionResultParamService {
+    /**
+     * 根据
+     * @param sequenceNbr
+     * @return
+     */
+    List<JyjcInspectionResultParam> getParamByResultSeq(Long sequenceNbr);
+}

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

@@ -2,4 +2,14 @@
 <!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.JyjcInspectionApplicationAttachmentMapper">
 
+    <delete id="deleteByApplicationSeq">
+        delete
+        *
+        from
+        tz_jyjc_inspection_application_attachment
+        where
+        application_seq = #{applicationSeq}
+
+
+    </delete>
 </mapper>

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

@@ -2,4 +2,15 @@
 <!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.JyjcInspectionApplicationEquipMapper">
 
+    <delete id="deleteByApplicationSeq">
+
+        delete
+        *
+        from
+        tz_jyjc_inspection_application_equip
+        where
+        application_seq = #{applicationSeq}
+
+
+    </delete>
 </mapper>

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

@@ -2,4 +2,65 @@
 <!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.JyjcInspectionApplicationMapper">
 
+    <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.status
+        from
+        tz_jyjc_inspection_application as tzjia
+        where
+        tzjia.is_delete = 0
+        <if test=" applicationNo != null and applicationNo != ''">
+            and applicationNo like concat('%',#{applicationNo}.'%')
+        </if>
+        <if test="inspectionType != null and inspectionType != ''">
+            and inspectionType = #{inspectionType}
+        </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},'%'))
+        </if>
+        <if test="inspectionUnitCode != null and inspectionUnitCode != ''">
+            and inspection_unit_code = #{inspectionUnitCode}
+        </if>
+        <if test="applicationUnitCode != null and applicationUnitCode != ''">
+            and application_unit_code = #{applicationUnitCode}
+        </if>
+        <if test="applicationUnitName != null and applicationUnitName != ''">
+            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}
+        </if>
+        <if test="applicationDate != null and applicationDate != ''">
+            and applicationDate = #{applicationDate}
+        </if>
+        <if test="acceptDate != null and acceptDate != ''">
+            and acceptDate = #{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}.'%')
+        </if>
+        <if test="status != null and status != ''">
+            and status = #{status}
+        </if>
+        <if test="bizType != null and bizType != ''">
+            and biz_type = #{bizType}
+        </if>
+    </select>
 </mapper>

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

@@ -2,4 +2,24 @@
 <!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.JyjcInspectionResultMapper">
 
+    <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
+        <where>
+            <if test="jyjcInspectionResultModel.applicationNo != '' and jyjcInspectionResultModel.applicationNo != null">
+                and application_no like concat('%',#{jyjcInspectionResultModel.applicationNo},'%')
+            </if>
+            <if test="jyjcInspectionResultModel.inspectionUnitCode != '' and jyjcInspectionResultModel.inspectionUnitCode != null">
+                and inspection_unit_code = #{jyjcInspectionResultModel.inspectionUnitCode}
+            </if>
+            <if test="jyjcInspectionResultModel.applicationUnitCode != '' and jyjcInspectionResultModel.applicationUnitCode != null">
+                and application_unit_code  =  #{jyjcInspectionResultModel.applicationUnitCode}
+            </if>
+        </where>
+
+    </select>
 </mapper>

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

@@ -23,23 +23,27 @@
         workflow_prostance_id,
         workflow_role,
         unit_code_name,
+        status,
         status_name
         from tz_jyjc_opening_application
         <where>
-            <if test="jyjcOpeningApplicationModel.applicationSeq != '' and jyjcOpeningApplicationModel.applicationSeq != null">
-                and application_seq like concat('%',#{jyjcOpeningApplicationModel.applicationSeq},'%')
+            <if test="jyjcOpeningApplicationRequstDto.applicationSeq != '' and jyjcOpeningApplicationRequstDto.applicationSeq != null">
+                and application_seq like concat('%',#{jyjcOpeningApplicationRequstDto.applicationSeq},'%')
+            </if>
+            <if test="jyjcOpeningApplicationRequstDto.unitCode != '' and jyjcOpeningApplicationRequstDto.unitCode != null">
+                and unit_code like concat('%',#{jyjcOpeningApplicationRequstDto.unitCode},'%')
             </if>
-            <if test="jyjcOpeningApplicationModel.unitCode != '' and jyjcOpeningApplicationModel.unitCode != null">
-                and unit_code like concat('%',#{jyjcOpeningApplicationModel.unitCode},'%')
+            <if test="jyjcOpeningApplicationRequstDto.acceptDate != '' and jyjcOpeningApplicationRequstDto.acceptDate != null">
+                and accept_date = #{jyjcOpeningApplicationRequstDto.acceptDate},
             </if>
-            <if test="jyjcOpeningApplicationModel.acceptDate != '' and jyjcOpeningApplicationModel.acceptDate != null">
-                and accept_date like concat('%',#{jyjcOpeningApplicationModel.acceptDate},'%')
+            <if test="jyjcOpeningApplicationRequstDto.status != '' and jyjcOpeningApplicationRequstDto.status != null">
+                and status = #{jyjcOpeningApplicationRequstDto.status}
             </if>
-            <if test="jyjcOpeningApplicationModel.status != '' and jyjcOpeningApplicationModel.status != null">
-                and status like concat('%',#{jyjcOpeningApplicationModel.status},'%')
+            <if test="applyendTime != '' and applyendTime != null">
+                and apply_time &lt;= #{applyendTime}
             </if>
-            <if test="jyjcOpeningApplicationModel.applyTime != '' and jyjcOpeningApplicationModel.applyTime != null">
-                and apply_time like concat('%',#{jyjcOpeningApplicationModel.applyTime},'%')
+            <if test="applyStartTime != '' and applyStartTime != null">
+                and apply_time &gt;=#{applyStartTime}
             </if>
         </where>
 

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

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-workflow</artifactId>
-            <version>1.8.5</version>
+            <version>1.10.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

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.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
+ */
+@RestController
+@Api(tags = "公共接口controller")
+@RequestMapping(value = "/common")
+public class CommonController extends BaseController {
+
+	@Autowired
+	CommonserviceImpl commonserviceImpl;
+
+
+    /**
+     * 新增
+     *
+     * @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));
+	}
+
+}

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.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 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.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 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 org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +41,8 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationMode
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
+import static com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl.buildOrderNo;
+
 /**
  * 
  *
@@ -30,6 +56,12 @@ public class JyjcInspectionApplicationController extends BaseController {
 
     @Autowired
     JyjcInspectionApplicationServiceImpl jyjcInspectionApplicationServiceImpl;
+    @Autowired
+	JyjcInspectionApplicationAttachmentServiceImpl jyjcInspectionApplicationAttachmentService;
+	@Autowired
+	JyjcInspectionApplicationEquipServiceImpl jyjcInspectionApplicationEquipService;
+	@Autowired
+	WorkflowFeignService workflowFeignService;
 
     /**
      * 新增
@@ -40,10 +72,86 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<JyjcInspectionApplicationModel> save(@RequestBody JyjcInspectionApplicationModel model) {
-	    model = jyjcInspectionApplicationServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+
+       //开启报检流程工作流
+
+		if ( !model.getOperationType().equals("2")){
+			if (model.getOperationType().equals("0")){
+				JSONObject body = new JSONObject();
+				String businessKey = buildOrderNo();
+				body.put(WorkFlowEnum.BUSINESSKEY.getCode(), businessKey);
+				body.put(WorkFlowEnum.processDefinitionKey.getCode(), model.getProcessKey());
+				JSONObject jsonObject = workflowFeignService.startProcess(body);
+				String processId = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("result"))).getString("id");
+				model.setProcessInstanceId(processId);
+				model.setStatus("已提交");
+			}else if ( model.getOperationType().equals("1")){
+				model.setStatus("草稿");
+			}
+			model = jyjcInspectionApplicationServiceImpl.createWithModel(model);
+			//保存报检装备监管码
+			if ( model.getEquip().size() > 0){
+				List<Map<String, Object>> equip = model.getEquip();
+				List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
+				for (String s : jgm) {
+					JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
+					equipInfo.setApplicationSeq(model.getSequenceNbr());
+					equipInfo.setEquipUnicode(s);
+					jyjcInspectionApplicationEquipService.save(equipInfo);
+				}
+			}
+
+			Map<String, Object> map = BeanUtil.beanToMap(model);
+			// 附件保存
+			List<String> enumNameList = DocumentEnum.getEnumNameList();
+			List<JyjcInspectionApplicationAttachmentModel> attachmentModels = new ArrayList<>();
+			for (String code : enumNameList) {
+				if (map.containsKey(code)){
+					JyjcInspectionApplicationAttachment attachments = new JyjcInspectionApplicationAttachment();
+					attachments.setAttachmentType(code);
+					attachments.setAttachmentUrl(JSONObject.toJSONString(map.get(code)));
+					attachments.setApplicationSeq(model.getSequenceNbr());
+					jyjcInspectionApplicationAttachmentService.getBaseMapper().insert(attachments);
+				}
+			}
+		}else {
+
+			//更新报检装备监管码
+			jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
+			if ( model.getEquip().size() > 0){
+				List<Map<String, Object>> equip = model.getEquip();
+				List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
+				for (String s : jgm) {
+					JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
+					equipInfo.setApplicationSeq(model.getSequenceNbr());
+					equipInfo.setEquipUnicode(s);
+					jyjcInspectionApplicationEquipService.save(equipInfo);
+				}
+			}
+
+			Map<String, Object> map = BeanUtil.beanToMap(model);
+			// 附件更新
+			List<String> enumNameList = DocumentEnum.getEnumNameList();
+			List<JyjcInspectionApplicationAttachmentModel> attachmentModels = new ArrayList<>();
+
+			jyjcInspectionApplicationAttachmentService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
+			for (String code : enumNameList) {
+				if (map.containsKey(code)){
+					JyjcInspectionApplicationAttachment attachments = new JyjcInspectionApplicationAttachment();
+					attachments.setAttachmentType(code);
+					attachments.setAttachmentUrl(JSONObject.toJSONString(map.get(code)));
+					attachments.setApplicationSeq(model.getSequenceNbr());
+					jyjcInspectionApplicationAttachmentService.getBaseMapper().insert(attachments);
+				}
+			}
+			model.setStatus("已提交");
+			jyjcInspectionApplicationServiceImpl.updateWithModel(model);
+		}
+		return ResponseHelper.buildResponse(model);
 	}
 
+
+
 	/**
      * 根据sequenceNbr更新
      *
@@ -54,7 +162,9 @@ public class JyjcInspectionApplicationController extends BaseController {
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
 	public ResponseModel<JyjcInspectionApplicationModel> updateBySequenceNbrJyjcInspectionApplication(@RequestBody JyjcInspectionApplicationModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
+
+
+		model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.updateWithModel(model));
 	}
 
@@ -92,21 +202,58 @@ public class JyjcInspectionApplicationController extends BaseController {
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<JyjcInspectionApplicationModel>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JyjcInspectionApplicationModel> page = new Page<JyjcInspectionApplicationModel>();
+	@GetMapping(value = "/pageByInstitution")
+	@ApiOperation(httpMethod = "GET",value = "分页查询（检验机构）",  notes = "分页查询（检验机构）")
+	public ResponseModel<Page<JyjcInspectionApplication>> queryForPageByInstitution(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size,@RequestParam(required = false) String applicationNo,
+											  @RequestParam(required = false) String inspectionClassify,
+											  @RequestParam(required = false) String applicationUnitCode,
+											  @RequestParam(required = false) String applicationUnitName,
+											  @RequestParam(required = false) String inspectionUnitName,
+											  @RequestParam(required = false) String equipClassify,
+											  @RequestParam(required = false) String inspectionUnitCode,
+											  @RequestParam(required = false) String applicationDate,
+											  @RequestParam(required = false) String acceptDate,
+											  @RequestParam(required = false) String inspectionChargePerson,
+											  @RequestParam(required = false) String status , String bizType) {
+	    Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page));
+
+		ReginParams reginParams = getSelectedOrgInfo();
+		inspectionUnitCode = reginParams.getCompany().getCompanyCode();
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,applicationUnitName,equipClassify,inspectionUnitCode,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
 	}
 
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
+
+		@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/pageByCompany")
+	@ApiOperation(httpMethod = "GET",value = "分页查询（报检单位）",  notes = "分页查询（报检单位）")
+	public ResponseModel<Page<JyjcInspectionApplication>> queryForPageByCompany(@RequestParam(value = "current") int current,@RequestParam
+			(value = "size") int size,@RequestParam(required = false) String applicationNo,
+																				@RequestParam(required = false) String inspectionClassify,
+																				@RequestParam(required = false) String applicationUnitCode,
+																				@RequestParam(required = false) String equipClassify,
+																				@RequestParam(required = false) String inspectionUnitCode,
+																				@RequestParam(required = false) String applicationUnitName,
+																				@RequestParam(required = false) String inspectionUnitName,
+																				@RequestParam(required = false) String applicationDate,
+																				@RequestParam(required = false) String acceptDate,
+																				@RequestParam(required = false) String inspectionChargePerson,
+																				@RequestParam(required = false) String status , String bizType) {
+		Page<JyjcInspectionApplication> page = new Page<JyjcInspectionApplication>();
+		page.setCurrent(current);
+		page.setSize(size);
+		ReginParams reginParams = getSelectedOrgInfo();
+		applicationUnitCode = reginParams.getCompany().getCompanyCode();
+		return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.queryForJyjcInspectionApplicationPage(page,applicationNo,inspectionClassify,applicationUnitCode,applicationUnitName,equipClassify,inspectionUnitCode,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType));
+		}
+
+			/**
+             * 列表全部数据查询
+             *
+             * @return
+             */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
-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 java.util.List;
-import java.util.Map;
-
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionResultServiceImpl;
-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.JyjcInspectionResultModel;
-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 javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 
@@ -86,23 +84,6 @@ public class JyjcInspectionResultController extends BaseController {
 	    return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryDetailBySeq(sequenceNbr));
 	}
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<JyjcInspectionResultModel>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JyjcInspectionResultModel> page = new Page<JyjcInspectionResultModel>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.queryForJyjcInspectionResultPage(page));
-	}
 
 	/**
 	 * 列表全部数据查询
@@ -115,4 +96,56 @@ public class JyjcInspectionResultController extends BaseController {
 	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)
+	@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));
+	}
+
+	/**
+	 * 检验结果-上传结果和编辑结果
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/updateResult")
+	@ApiOperation(httpMethod = "PUT", value = "检验结果-上传结果和编辑结果", notes = "检验结果-上传结果和编辑结果")
+	public ResponseModel<JyjcInspectionResultModel> updateJyjcInspectionResult(@RequestBody JyjcInspectionResultModel model) {
+		return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.updateJyjcInspectionResult(model));
+	}
 }

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.model.JyjcOpeningApplicationRequstDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -123,11 +124,11 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
 	public ResponseModel<Page<JyjcOpeningApplicationModel>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,JyjcOpeningApplicationModel jyjcOpeningApplicationDto) {
+                    (value = "size") int size,JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto) {
 	    Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page,jyjcOpeningApplicationDto));
+	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page,jyjcOpeningApplicationRequstDto));
 	}
 
 
@@ -141,12 +142,12 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/pageForCompany")
 	@ApiOperation(httpMethod = "GET",value = "分页查询-公司",  notes = "分页查询-公司")
-	public ResponseModel<Page<JyjcOpeningApplicationModel>> querypageForCompany(@RequestParam(value = "current") int current,@RequestParam
-			(value = "size") int size,JyjcOpeningApplicationModel jyjcOpeningApplicationDto) {
+	public ResponseModel<Page<JyjcOpeningApplicationModel>> querypageForCompany(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size, JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto) {
 		Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
 		page.setCurrent(current);
 		page.setSize(size);
-		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.querypageForCompany(page,jyjcOpeningApplicationDto));
+		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.querypageForCompany(page,jyjcOpeningApplicationRequstDto));
 	}
 
 	/**
@@ -186,7 +187,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "撤回业务开通申请",   notes = "撤回业务开通申请")
-	@GetMapping(value = "/stopFlow")
+	@GetMapping(value = "/rollBackFlow")
 	public void overflow( @RequestParam("instanceId") String instanceId) {
 		jyjcOpeningApplicationServiceImpl.stopFlow(instanceId);
 	}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/WorkflowFeignClient.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.feign;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,6 +57,7 @@ public interface WorkflowFeignClient {
             @RequestHeader(name="token",required = true) String token,
             @PathVariable(value = "processInstanceId") String processInstanceId);
 
-
+    @RequestMapping(value = "/v2/task/rollBack/{processInstanceId}", method = RequestMethod.POST)
+    JSONObject rollBack(@PathVariable(value = "processInstanceId") String processInstanceId);
 }
 

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+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.TzsUserInfo;
+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;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import java.util.List;
+
 
 @Service
 public class CommonserviceImpl {
+
+    @Value("${jyjc.user-post:6615}")
+    private String jyjcUserPost;
     @Autowired
     RedisUtils redisUtils;
+    @Autowired
+    TzsUserInfoMapper userInfoMapper;
+
 
     /**
-     * @description 获取当前用户注册信息
      * @return ReginParams
+     * @description 获取当前用户注册信息
      */
-    ReginParams getReginParamsOfCurrentUser() {
+    public ReginParams getReginParamsOfCurrentUser() {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         return reginParams;
     }
 
+    public List<TzsUserInfo> getUserInfosByUnitCode(String unitCode) {
+        QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
+        userInfoQueryWrapper.eq("unit_code", unitCode);
+        userInfoQueryWrapper.like("post", jyjcUserPost);
+        List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
+        return userInfos;
+    }
 }

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

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,8 +22,23 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     /**
      * 分页查询
      */
-    public Page<JyjcInspectionApplicationModel> queryForJyjcInspectionApplicationPage(Page<JyjcInspectionApplicationModel> page)   {
-        return this.queryForPage(page, null, false);
+
+
+    public Page<JyjcInspectionApplication> queryForJyjcInspectionApplicationPage(Page<JyjcInspectionApplication> page,
+                                                                                      String applicationNo,
+                                                                                      String inspectionClassify,
+                                                                                      String applicationUnitCode,
+                                                                                      String equipClassify,
+                                                                                      String inspectionUnitCode,
+                                                                                      String applicationUnitName,
+                                                                                      String inspectionUnitName,
+                                                                                      String applicationDate,
+                                                                                      String acceptDate,
+                                                                                      String inspectionChargePerson,
+                                                                                      String status , String bizType)   {
+
+     return    this.getBaseMapper().queryForDataList(page,applicationNo,inspectionClassify,applicationUnitCode,applicationUnitName,equipClassify,inspectionUnitCode,inspectionUnitName,applicationDate,acceptDate,inspectionChargePerson,status,bizType);
+
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/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.entity.JyjcInspectionResultParam;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultParamMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultParamService;
@@ -30,4 +31,11 @@ public class JyjcInspectionResultParamServiceImpl extends BaseService<JyjcInspec
     public List<JyjcInspectionResultParamModel> queryForJyjcInspectionResultParamList()   {
         return this.queryForList("" , false);
     }
+
+    @Override
+    public List<JyjcInspectionResultParam> getParamByResultSeq(Long sequenceNbr) {
+        LambdaQueryWrapper<JyjcInspectionResultParam> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyjcInspectionResultParam::getResultSeq, sequenceNbr);
+        return this.baseMapper.selectList(wrapper);
+    }
 }
\ 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.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+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.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultParam;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultMapper;
+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 org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+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.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.HashMap;
 import java.util.List;
@@ -28,24 +35,62 @@ import java.util.stream.Collectors;
  * @date 2023-12-14
  */
 @Service
-public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionResultModel,JyjcInspectionResult,JyjcInspectionResultMapper> implements IJyjcInspectionResultService {
+public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionResultModel, JyjcInspectionResult, JyjcInspectionResultMapper> implements IJyjcInspectionResultService {
 
     @Autowired
-    private IJyjcInspectionResultAttachmentService jyjcInspectionResultAttachmentService;
+    private IJyjcInspectionResultAttachmentService iJyjcInspectionResultAttachmentService;
 
+    @Autowired
+    private IJyjcInspectionResultParamService iJyjcInspectionResultParamService;
+
+    @Autowired
+    JyjcInspectionResultMapper resultMapper;
+
+    @Autowired
+    JyjcInspectionResultParamServiceImpl resultParamService;
+    @Autowired
+    JyjcInspectionResultAttachmentServiceImpl attachmentService;
+    @Autowired
+    private RedisUtils redisUtils;
 
     /**
-     * 分页查询
+     * 检验检测单位分页查询
      */
-    public Page<JyjcInspectionResultModel> queryForJyjcInspectionResultPage(Page<JyjcInspectionResultModel> page)   {
-        return this.queryForPage(page, null, false);
+    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 (type) {
+            //检验检测单位分页查询
+            model.setInspectionUnitCode(reginParams.getCompany().getCompanyCode());
+        } else {
+            //报检单位分页查询
+            model.setApplicationUnitCode(reginParams.getCompany().getCompanyCode());
+        }
+        Page<JyjcInspectionResultModel> resultPage = resultMapper.selectJyjcInspectionResultpPage(page, model);
+        resultPage.getRecords().stream().forEach(v -> {
+            if (ResultStatusEnum.NO_RESULT.getCode().equals(v.getResultStatus()))
+                v.setResultStatusName(ResultStatusEnum.NO_RESULT.getName());
+            if (ResultStatusEnum.YES_RESULT.getCode().equals(v.getResultStatus()))
+                v.setResultStatusName(ResultStatusEnum.YES_RESULT.getName());
+        });
+        return resultPage;
+    }
+
+
+    public JyjcInspectionResultModel updateJyjcInspectionResult(JyjcInspectionResultModel model) {
+        updateWithModel(model);
+        if (ObjectUtil.isNotEmpty(model.getResultAttachmentModel()))
+            attachmentService.createWithModel(model.getResultAttachmentModel());
+        if (ObjectUtil.isNotEmpty(model.getResultParamModel()))
+            resultParamService.createWithModel(model.getResultParamModel());
+        return model;
     }
 
     /**
      * 列表查询 示例
      */
-    public List<JyjcInspectionResultModel> queryForJyjcInspectionResultList()   {
-        return this.queryForList("" , false);
+    public List<JyjcInspectionResultModel> queryForJyjcInspectionResultList() {
+        return this.queryForList("", false);
     }
 
     @Override
@@ -58,11 +103,23 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             map = BeanUtil.beanToMap(jyjcInspectionResultModel);
 
             // 获取附件
-            List<JyjcInspectionResultAttachment> attachmentList = jyjcInspectionResultAttachmentService.getObjByResultSeq(sequenceNbr);
+            List<JyjcInspectionResultAttachment> attachmentList = iJyjcInspectionResultAttachmentService.getObjByResultSeq(sequenceNbr);
             if (!CollectionUtils.isEmpty(attachmentList)) {
                 Map<String, Object> attachmentMap = attachmentList.stream().collect(Collectors.toMap(JyjcInspectionResultAttachment::getAttachmentType, JyjcInspectionResultAttachment::getAttachmentUrl));
                 map.putAll(attachmentMap);
             }
+
+            // 获取技术参数
+            List<JyjcInspectionResultParam> paramList = iJyjcInspectionResultParamService.getParamByResultSeq(sequenceNbr);
+            Map<String, Object> mapParam = new HashMap<>();
+            if (!CollectionUtils.isEmpty(paramList)) {
+                paramList.forEach(param -> {
+                    if (!ObjectUtils.isEmpty(param.getParamJson())) {
+                        mapParam.putAll(JSON.parseObject(param.getParamJson()));
+                    }
+                });
+                map.put("paramJson", mapParam);
+            }
         }
         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/JyjcOpeningApplicationServiceImpl.java

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -14,6 +16,7 @@ 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.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
@@ -42,6 +45,7 @@ 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 javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -64,10 +68,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper;
 
-    @Resource (type = JyjcBaseMapper.class)
+    @Resource(type = JyjcBaseMapper.class)
     private JyjcBaseMapper baseMapper;
 
-    @Value ("${process-definition-key.jyjc.openapplication:}")
+    @Value("${process-definition-key.jyjc.openapplication:}")
     private String processDefinitionKey;
 
     @Value("${jyjc.user-post:6615}")
@@ -86,7 +90,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     private WorkflowFeignClient workflowFeignClient;
 
-    @Transactional (rollbackFor = {Exception.class, BaseException.class})
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel saveOrUpdateModel(JyjcOpeningApplicationModel model, Boolean enableStartFlow) {
         try {
             if (enableStartFlow) {
@@ -94,7 +98,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 String instanceId = startFlow();
                 JSONObject dataObject = getTask(instanceId);
                 JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
-                if(!ValidationUtil.isEmpty(executorArray)) {
+                if (!ValidationUtil.isEmpty(executorArray)) {
                     String roleGroups = executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
                     model.setWorkflowRole(roleGroups);
                 }
@@ -105,7 +109,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 // model.setStatus(!ValidationUtil.isEmpty(dataObject) && !ValidationUtil.isEmpty(dataObject.get("status")) ? String.valueOf(dataObject.get("status")) : "");
                 model.setWorkflowProstanceId(instanceId);
                 // 默认自动执行第一步
-                execueFlow(MapBuilder.<String,Object>create().put("op", "0").put("instanceId", instanceId).put("comments", "").build());
+                execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", instanceId).put("comments", "").build());
             } else {
                 model.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
                 model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
@@ -126,12 +130,12 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         }
     }
 
-    @Transactional (rollbackFor = {Exception.class, BaseException.class})
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
     public JyjcOpeningApplicationModel resubmit(JyjcOpeningApplicationModel model) {
         model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + "");
         model.setStatusName(FlowStatusEnum.SUBMITTED.getName());
         model = this.updateWithModel(model);
-        execueFlow(MapBuilder.<String,Object>create().put("op", "0").put("instanceId", model.getWorkflowProstanceId()).put("comments", "").build());
+        execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", model.getWorkflowProstanceId()).put("comments", "").build());
         return model;
     }
 
@@ -169,17 +173,32 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return this.queryForList("", false);
     }
 
-    public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) {
-        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationModel);
+    public Page<JyjcOpeningApplicationModel> queryForJyjcOpeningApplicationPage(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto) {
+        String applyStartTime = "";
+        String applyEndTime = "";
+        if (ObjectUtils.isNotEmpty(jyjcOpeningApplicationRequstDto.getApplyTime())) {
+            String date = jyjcOpeningApplicationRequstDto.getApplyTime();
+            applyStartTime = date + " 00:00:00";
+            applyEndTime = date + " 23:59:59";
+        }
+        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationRequstDto, applyStartTime, applyEndTime);
     }
 
-    public Page<JyjcOpeningApplicationModel> querypageForCompany(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationModel jyjcOpeningApplicationModel) {
+    public Page<JyjcOpeningApplicationModel> querypageForCompany(Page<JyjcOpeningApplication> page, JyjcOpeningApplicationRequstDto jyjcOpeningApplicationRequstDto) {
         //根据申请单中的单位信息对于列表数据进行过滤
         CompanyBo companyBo = commonserviceImpl.getReginParamsOfCurrentUser().getCompany();
         if (companyBo.getLevel().equals("company")) {
-            jyjcOpeningApplicationModel.setUnitCode(companyBo.getCompanyCode());
+            jyjcOpeningApplicationRequstDto.setUnitCode(companyBo.getCompanyCode());
+        }
+
+        String applyStartTime = "";
+        String applyEndTime = "";
+        if (ObjectUtils.isNotEmpty(jyjcOpeningApplicationRequstDto.getApplyTime())) {
+            String date = jyjcOpeningApplicationRequstDto.getApplyTime();
+            applyStartTime = date + " 00:00:00";
+            applyEndTime = date + " 23:59:59";
         }
-        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationModel);
+        return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page, jyjcOpeningApplicationRequstDto, applyStartTime, applyEndTime);
     }
 
 
@@ -203,7 +222,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);
@@ -221,7 +240,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
             }
             jyjcOpeningApplicationModel.setLongitude(baseUnitLicenceEntity.getLongitude());
             jyjcOpeningApplicationModel.setLatitude(baseUnitLicenceEntity.getLatitude());
-            if(ObjectUtils.isNotEmpty(baseUnitLicenceEntity.getUnitBusinessLicense())) {
+            if (ObjectUtils.isNotEmpty(baseUnitLicenceEntity.getUnitBusinessLicense())) {
                 jyjcOpeningApplicationModel.setUnitBusinessLicense(JSONArray.parseArray(baseUnitLicenceEntity.getUnitBusinessLicense(), AttachmentDto.class));
             }
         }
@@ -233,7 +252,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList(MapBuilder.<String, Object>create()
                 .put("unitCode", unitCode)
                 // .put("licenceType", LicenceTypeEnum.JYJC.getCode())
-                                                                                                     .build());
+                .build());
         jyjcOpeningApplicationModel.setBaseUnitLicences(baseUnitLicences);
         // 获取检验人员信息
         QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
@@ -280,10 +299,10 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 接收/驳回通知检验单
      */
-   public void execueFlow(Map<String,Object> params) {
-       String op = params.get("op").toString();
-       String instanceId = params.get("instanceId").toString();
-       String comments= params.get("comments").toString();
+    public void execueFlow(Map<String, Object> params) {
+        String op = params.get("op").toString();
+        String instanceId = params.get("instanceId").toString();
+        String comments = params.get("comments").toString();
         try {
             AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
             JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
@@ -293,8 +312,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
 //            dto.setResult(op);
             dto.setResultCode("approvalStatus");
             dto.setTaskId(taskId);
-            HashMap<String,Object> varibalble = new HashMap<>();
-            varibalble.put("approvalStatus",op);
+            HashMap<String, Object> varibalble = new HashMap<>();
+            varibalble.put("approvalStatus", op);
             dto.setVariable(varibalble);
             dto.setComment(comments);
             //执行流程
@@ -303,13 +322,16 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
 
             }
             updateModelByInstanceId(instanceId, "0".equals(op) ? FlowStatusEnum.HAVE_PROCESSED.getCode() + "" : FlowStatusEnum.REJECTED.getCode() + "");
-            if(op.equals("0")){
+            if (op.equals("0")) {
                 String originalDataId = params.get("originalDataId").toString();
-                JyjcOpeningApplication jyjcOpeningApplication=jyjcOpeningApplicationMapper.selectById(originalDataId);
-                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().replace("[","").replace("]","").split(",")) ;
+                JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationMapper.selectById(originalDataId);
+                List<String> detectionRegion = Arrays.asList(params.get("detectionRegion").toString().replace("[", "").replace("]", "").split(","));
 //                String detectionRegionName =  params.get("detectionRegionName").toString();
                 jyjcOpeningApplication.setDetectionRegion(detectionRegion);
 //                jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
+                if(ObjectUtils.isEmpty(jyjcOpeningApplication.getAcceptDate())){
+                    jyjcOpeningApplication.setAcceptDate(new Date());
+                }
                 jyjcOpeningApplicationMapper.updateById(jyjcOpeningApplication);
             }
         } catch (Exception e) {
@@ -320,14 +342,14 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 撤回流程办理单
      */
-   public void stopFlow(String instanceId) {
+    public void stopFlow(String instanceId) {
         try {
             //撤回流程
-            AjaxResult ajaxResult1 = Workflow.taskClient.stopProcess(instanceId);
-            if (ObjectUtils.isEmpty(ajaxResult1)) {
+            JSONObject jsonObject = workflowFeignClient.rollBack(instanceId);
+            if (ObjectUtils.isEmpty(jsonObject)) {
 
             }
-            updateModelByInstanceId(instanceId, FlowStatusEnum.REJECTED.getCode() + "");
+            updateModelByInstanceId(instanceId, FlowStatusEnum.ROLLBACK.getCode() + "");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -339,7 +361,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
 
     private String getWorkflowRoleGroups(JSONObject dataObject) {
         JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
-        if(!ValidationUtil.isEmpty(executorArray)) {
+        if (!ValidationUtil.isEmpty(executorArray)) {
             return executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
         }
         return null;