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

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

@@ -90,4 +90,11 @@ public class JgUseRegistrationDto  extends BaseDto {
     @ApiModelProperty(value = "录入单位ID")
     private String inputUnitNo;
 
+    @ApiModelProperty(value = "设备类别")
+    private String equCategory;
+
+    @ApiModelProperty(value = "设备代码")
+    private String equCode;
+
+
 }

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

@@ -160,4 +160,12 @@ public class JgUseRegistration extends BaseEntity {
 	@TableField("input_unit_no")
     private String inputUnitNo;
 
+    @TableField("use_registration_code")
+    private String useRegistrationCode;
+
+    @TableField("instance_id")
+    private String instanceId;
+
+    @TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
 }

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -11,4 +16,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgUseRegistrationDto dto);
+
+    Map<String, Object> getDetail(@Param("id")String id);
+
+    Map<String, Object> getInspectDetail(@Param("id")String id);
+
+    Map<String, Object> getUseDetail(@Param("id")String id);
+
+    Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
+
 }

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

@@ -2,4 +2,114 @@
 <!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.jg.api.mapper.JgUseRegistrationMapper">
 
+
+    <select id="getListPage" resultType="java.util.Map">
+        select ur.sequence_nbr as sequenceNbr,
+        ur.audit_status as auditStatus,
+        ur.reg_date as regDate,
+        ur.use_unit_name as useUnitName,
+        ur.status,
+        ur.receive_org_name as receiveOrgName,
+        (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
+        jri.PRODUCT_NAME as productName,
+        jri.EQU_CODE as equCode,
+        use.USE_INNER_CODE as innerCode,
+        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place
+        from tzs_jg_use_registration ur
+        LEFT JOIN tzs_jg_relation_equip re  on ur.sequence_nbr = re.business_id
+        LEFT JOIN idx_biz_jg_register_info jri  on re.equip_id = jri.RECORD
+        LEFT JOIN idx_biz_jg_use_info  use   on re.equip_id = use.RECORD
+
+        <where>
+            and  ur.is_delete = 0
+            <if test="dto.equCategory != null and dto.equCategory != ''">
+                and jri.EQU_CATEGORY = #{dto.equCategory}
+            </if>
+            <if test="dto.auditStatus != null and dto.auditStatus != ''">
+                and ur.audit_status = #{dto.auditStatus}
+            </if>
+            <if test="dto.equCode != null and dto.equCode != ''">
+                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
+            </if>
+            <if test="dto.useUnitName != null and dto.useUnitName != ''">
+                and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
+            </if>
+        </where>
+    </select>
+    <select id="getDetail" resultType="java.util.Map">
+        SELECT jri.EQU_CODE                                                           as equCode,
+                     (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+                     (SELECT name from tz_equipment_category where code = jri.EQU_LIST)     as equList,
+                     (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)   as equDefine,
+                     jri.PRODUCT_NAME                                                       as productName,
+                     jri.EQU_TYPE                                                           as equType,
+                     jri.PRODUCT_PHOTO                                                      as proDuctPhoto,
+                     jfi.FACTORY_NUM                                                        as factoryNum,
+                     jfi.PRODUCE_UNIT_NAME                                                  as produceUnitName,
+                     jfi.PRODUCE_DATE                                                       as produceDate,
+                     jfi.FACTORY_STANDARD                                                   as factoryStandard,
+                     jfi.PRODUCT_QUALITY_YIELD_PROVE                                        as productQualityYieldProve,
+                     jfi.INS_USE_MAINTAIN_EXPLAIN                                           as insUseMaintainExplanin,
+                     jci.USC_UNIT_NAME                                                      as uscUnitName,
+                     jci.USC_UNIT_CREDIT_CODE                                               as uscUnitCreditCode
+
+              from idx_biz_jg_register_info jri
+                       LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
+                       LEFT JOIN idx_biz_jg_construction_info jci on jri.RECORD = jci.RECORD
+              where jri.RECORD = #{id}
+
+
+
+    </select>
+    <select id="getInspectDetail" resultType="java.util.Map">
+        SELECT INSPECT_TYPE       as inspectType,
+               INSPECT_STAFF      as inspctStaff,
+               INSPECT_CONCLUSION as inspectConclusion,
+               INSPECT_ORG_NAME   as inspectOrgName,
+               INSPECT_DATE       as inspectDate,
+               NEXT_INSPECT_DATE  as nextInspectDate,
+               INSPECT_REPORT     as inspectReport
+        from idx_biz_jg_inspection_detection_info
+        where RECORD = #{id}
+        ORDER BY INSPECT_DATE desc LIMIT 1
+    </select>
+    <select id="getUseDetail" resultType="java.util.Map">
+        SELECT USE_UNIT_NAME as useUnitName,
+               USE_UNIT_CREDIT_CODE as useUnitCreditCode,
+               USE_PLACE as usePlace,
+               SAFETY_MANAGER as safetyManager,
+               PHONE as phone,
+               ESTATE_UNIT_NAME as estateUnitName,
+               ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
+               ADDRESS as address,
+               PROVINCE as province,
+               CITY as city,
+               COUNTY as county
+        FROM "idx_biz_jg_use_info"  where RECORD = #{id}
+    </select>
+    <select id="getEquipListPage" resultType="java.util.Map">
+        SELECT jri.EQU_CODE as equCode,
+               jri.RECORD  as id,
+        (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+        (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
+        jfi.FACTORY_NUM as factoryNum,
+        jui.ADDRESS as address,
+        jui.USE_INNER_CODE as useInnerCode,
+        jfi.PRODUCE_UNIT_NAME as produceUnitName
+        from idx_biz_jg_register_info jri
+        LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
+        LEFT JOIN idx_biz_jg_use_info jui on jri.RECORD = jui.RECORD
+        <where>
+            <if test="factoryNum != null and factoryNum != ''">
+                and jfi.FACTORY_NUM like concat('%',#{factoryNum},'%')
+            </if>
+            <if test="equList != null and equList != ''">
+                and jri.EQU_LIST like concat('%',#{equList},'%')
+            </if>
+            <if test="equCategory != null and equCategory != ''">
+                and jri.EQU_CATEGORY like concat('%',#{equCategory},'%')
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -25,6 +25,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yeejoin</groupId>
+            <artifactId>amos-feign-workflow</artifactId>
+            <version>1.8.5</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/JgUseRegistrationController.java

 package com.yeejoin.amos.boot.module.jg.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.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.AjaxResult;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+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.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
-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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-12
  */
@@ -31,86 +37,115 @@ public class JgUseRegistrationController extends BaseController {
     @Autowired
     JgUseRegistrationServiceImpl jgUseRegistrationServiceImpl;
 
-    /**
-     * 新增
-     *
-     * @return
-     */
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<JgUseRegistrationDto> save(@RequestBody JgUseRegistrationDto model) {
-	    model = jgUseRegistrationServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+    @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+    public ResponseModel<Object> save(@RequestBody JSONObject map) {
+        jgUseRegistrationServiceImpl.save(map);
+        return ResponseHelper.buildResponse("ok");
     }
 
-	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<JgUseRegistrationDto> updateBySequenceNbrJgUseRegistration(@RequestBody JgUseRegistrationDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.updateWithModel(model));
+    @PostMapping(value = "/deleteBatch")
+    @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+    public ResponseModel<Object> deleteBatch(@RequestBody JSONObject map) {
+        List<Long> ids = (List<Long>) map.get("ids");
+        jgUseRegistrationServiceImpl.deleteBatch(ids);
+        return ResponseHelper.buildResponse("ok");
     }
 
-	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.removeById(sequenceNbr));
+    @PostMapping(value = "/deleteMessage")
+    @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+    public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
+        ArrayList<Long> ids = new ArrayList<>();
+        ids.add(id);
+        jgUseRegistrationServiceImpl.deleteBatch(ids);
+        return ResponseHelper.buildResponse("ok");
     }
 
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<JgUseRegistrationDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.queryBySeq(sequenceNbr));
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/getList")
+    public ResponseModel<Page<Map<String, Object>>> getList(JgUseRegistrationDto dto,
+                                                            @RequestParam(value = "current") int current,
+                                                            @RequestParam(value = "size") int size) {
+        Page<Map<String, Object>> page = new Page<>(current, size);
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getList(dto, page));
     }
 
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<JgUseRegistrationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JgUseRegistrationDto> page = new Page<JgUseRegistrationDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.queryForJgUseRegistrationPage(page));
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/getEquipList")
+    public ResponseModel<Page<Map<String, Object>>> getEquipList(
+            @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size,
+            @RequestParam(value = "factoryNum", required = false) String factoryNum,
+            @RequestParam(value = "equList", required = false) String equList,
+            @RequestParam(value = "equCategory", required = false) String equCategory) {
+        Page<Map<String, Object>> page = new Page<>(current, size);
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getEquipList(page, factoryNum, equList, equCategory));
     }
 
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<JgUseRegistrationDto>> selectForList() {
-	    return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.queryForJgUseRegistrationList());
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/getDetail")
+    public ResponseModel<Map<String, Object>> getDetail(@RequestParam("id") String id) {
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(id));
     }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/test")
+    @ApiOperation(httpMethod = "GET", value = "", notes = "")
+    public ResponseModel test(@RequestParam("op") String op) {
+        String instanceId = "";
+        //启动流程
+        try {
+            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            dto.setProcessDefinitionKey("useRegistrationNew");
+            dto.setBusinessKey("1");
+            HashMap<String, Object> dtoMap = new HashMap<>();
+            dtoMap.put("approvalStatus", op);
+            dto.setVariables(dtoMap);
+            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
+            instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return ResponseHelper.buildResponse(instanceId);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/test1")
+    @ApiOperation(httpMethod = "GET", value = "", notes = "")
+    public void overProjectFlowExecute(@RequestParam("op") String op, @RequestParam("instanceId") String instanceId) {
+
+        try {
+            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+            String taskId = dataObject.getString("id");
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+            dto.setResult(op);
+            dto.setResultCode("approvalStatus");
+            dto.setTaskId(taskId);
+            dto.setComment("啦啦啦啦！！！！！");
+            //执行流程
+            AjaxResult ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
+
+            if (ObjectUtils.isEmpty(ajaxResult1)) {
+
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }

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

 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.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRelationEquip;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
+import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务实现类
@@ -16,18 +33,79 @@ import java.util.List;
  * @date 2023-12-12
  */
 @Service
-public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationDto,JgUseRegistration,JgUseRegistrationMapper> implements IJgUseRegistrationService {
-    /**
-     * 分页查询
-     */
-    public Page<JgUseRegistrationDto> queryForJgUseRegistrationPage(Page<JgUseRegistrationDto> page)   {
-        return this.queryForPage(page, null, false);
+public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationDto, JgUseRegistration, JgUseRegistrationMapper> implements IJgUseRegistrationService {
+
+    @Autowired
+    private UseInfoMapper useInfoMapper;
+    @Autowired
+    private InspectionDetectionInfoMapper inspectionDetectionInfoMapper;
+    @Autowired
+    private OtherInfoMapper otherInfoMapper;
+    @Autowired
+    private JgRelationEquipMapper jgRelationEquipMapper;
+
+    public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page) {
+        return this.baseMapper.getListPage(page, dto);
+    }
+    public Page<Map<String, Object>> getEquipList(Page<Map<String, Object>> page,String factoryNum,String equList,String equCategory) {
+        return this.baseMapper.getEquipListPage(page, factoryNum, equList , equCategory);
     }
 
-    /**
-     * 列表查询 示例
-     */
-    public List<JgUseRegistrationDto> queryForJgUseRegistrationList()   {
-        return this.queryForList("" , false);
+
+    public void save(JSONObject map){
+        UseInfo useInfo = new UseInfo();
+        BeanUtil.copyProperties(map, useInfo);
+        LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
+        lambda.eq(UseInfo::getRecord, map.get("equipId"));
+        // 更新使用信息
+        useInfoMapper.update(useInfo, lambda);
+        InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
+        BeanUtil.copyProperties(map, inspectionDetectionInfo);
+        LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
+        inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("equipId"));
+        // 更新检验检测信息
+        inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        // 使用登记信息
+        JgUseRegistration jgUseRegistration = new JgUseRegistration();
+        LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
+        otherLambda.eq(OtherInfo :: getRecord, map.get("equipId"));
+        OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
+        String supervisoryCode = otherInfo.getSupervisoryCode();
+        jgUseRegistration.setSupervisoryCode(supervisoryCode);
+        jgUseRegistration.setUseUnitName(useInfo.getUseUnitName());
+        jgUseRegistration.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
+//        jgUseRegistration.setAuditStatus();
+//        jgUseRegistration.setUseRegistrationCode();
+
+        this.save(jgUseRegistration);
+        // 业务管理设备信息保存
+        JgRelationEquip jgRelationEquip = new JgRelationEquip();
+        jgRelationEquip.setBusinessId(jgUseRegistration.getSequenceNbr().toString());
+        jgRelationEquip.setEquipId(map.get("equipId").toString());
+        jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
+        jgRelationEquipMapper.insert(jgRelationEquip);
+    }
+
+    public void deleteBatch(List<Long> ids) {
+        JgUseRegistration jgUseRegistration = new JgUseRegistration();
+        jgUseRegistration.setIsDelete(true);
+        LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
+        lambda.in(JgUseRegistration::getSequenceNbr, ids);
+        this.update(jgUseRegistration, lambda);
     }
+
+    public Map<String, Object> getDetail(String id) {
+        Map<String, Object> detail = this.baseMapper.getDetail(id);
+        Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
+        Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
+        detail.putAll(inspectDetail);
+        detail.putAll(useDetail);
+        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
+        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
+        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
+        detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
+        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        return detail;
+    }
+
 }
\ No newline at end of file

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

@@ -13,7 +13,7 @@
         result_type,
         expiry_date,
         accept_date,
-        `status`,
+        status,
         remark,
         sequence_nbr,
         rec_date,

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

+package com.yeejoin.amos.boot.module.jyjc.biz.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration(value="MybatisPlusConfig")
+public class MybatisPlusConfigs {
+
+	@Bean
+	public  PaginationInterceptor paginationInterceptor()
+	{
+		PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+		paginationInterceptor.setLimit(50000);
+		paginationInterceptor.setDialectType(DbType.POSTGRE_SQL.getDb());
+		return paginationInterceptor;
+	}
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application.properties

@@ -58,3 +58,5 @@ amos.system.user.app-key=AMOS_STUDIO
 amos.system.user.product=AMOS_STUDIO_WEB
 
 fire-rescue=123
+
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -81,4 +81,14 @@ public class ESEquipmentCategoryDto {
 
     @Field(type = FieldType.Text)
     private String USE_INNER_CODE;
+
+    @Field(type = FieldType.Text)
+    private String FACTORY_NUM;
+
+    @Field(type = FieldType.Text)
+    private String PRODUCE_UNIT_NAME;
+
+    @Field(type = FieldType.Text)
+    private String INSPECT_REPORT;
+
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/AbstractEquipBaseEntity.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public abstract class AbstractEquipBaseEntity {
 
@@ -14,7 +16,7 @@ public abstract class AbstractEquipBaseEntity {
     )
     protected String sequenceNbr;
     @TableField("\"REC_DATE\"")
-    protected String recDate;
+    protected Date recDate;
     @TableField("\"REC_USER_ID\"")
     protected String recUserId;