报检新增 列表接口

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/model/JyjcInspectionApplicationModel.java

@@ -92,6 +92,10 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "业务类型（与菜单对应拆表使用）")
     private String bizType;
 
+    @ApiModelProperty(value = "操作类型 0 新增 2 编辑 1 暂存")
+    private String operationType;
+
+
     private List<Map<String,Object>> gzs;
     private List<Map<String,Object>> cpzl;
     private List<Map<String,Object>> sgzx ;

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-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);
+
     }
 
     /**