fix(jg):维保删除接口调整

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

@@ -23,8 +23,6 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
                                                    @Param("contractDto") JgMaintenanceContractDto contractDto,
                                                    @Param("currentUserId") String currentUserId);
 
-    Boolean updateBySequenceNbr(@Param("dto") JgMaintenanceContractDto dto);
-
     JgMaintenanceContractDto queryBySequenceNbr(@Param("sequenceNbr") Long sequenceNbr);
 
     Boolean deleteForBatch(@Param("ids") List<Long> ids);

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!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.JgMaintenanceContractMapper">
-    <update id="updateBySequenceNbr">
-        UPDATE amos_tzs_biz.tzs_jg_maintenance_contract
-        <set>
-            <if test="dto.applyNo != null">
-                apply_no = #{dto.applyNo},
-            </if>
-            <if test="dto.applyStatus != null">
-                apply_status = #{dto.applyStatus},
-            </if>
-            <if test="dto.applyDate != null">
-                apply_date = #{dto.applyDate},
-            </if>
-            <if test="dto.equType != null">
-                equ_type = #{dto.equType},
-            </if>
-            <if test="dto.useUnitCode != null">
-                use_unit_code = #{dto.useUnitCode},
-            </if>
-            <if test="dto.useUnitName != null">
-                use_unit_name = #{dto.useUnitName},
-            </if>
-            <if test="dto.receiveOrgCode != null">
-                receive_org_code = #{dto.receiveOrgCode},
-            </if>
-            <if test="dto.receiveOrgName != null">
-                receive_org_name = #{dto.receiveOrgName},
-            </if>
-            <if test="dto.maintenanceUnitCode != null">
-                maintenance_unit_code = #{dto.maintenanceUnitCode},
-            </if>
-            <if test="dto.maintenanceUnitName != null">
-                maintenance_unit_name = #{dto.maintenanceUnitName},
-            </if>
-            <if test="dto.informStart != null">
-                inform_start = #{dto.informStart},
-            </if>
-            <if test="dto.informEnd != null">
-                inform_end = #{dto.informEnd},
-            </if>
-            <if test="dto.maintenanceManagerId != null">
-                maintenance_manager_id = #{dto.maintenanceManagerId},
-            </if>
-            <if test="dto.maintenanceManagerOneId != null">
-                maintenance_manager_one_id = #{dto.maintenanceManagerOneId},
-            </if>
-            <if test="dto.maintenanceManagerTwoId != null">
-                maintenance_manager_two_id = #{dto.maintenanceManagerTwoId},
-            </if>
-            <if test="dto.emergencyCall != null">
-                emergency_call = #{dto.emergencyCall},
-            </if>
-            <if test="dto.maintenance24Tel != null">
-                maintenance_24_tel = #{dto.maintenance24Tel},
-            </if>
-            <if test="dto.remark != null">
-                remark = #{dto.remark},
-            </if>
-            <if test="dto.isDelete != null">
-                is_delete = #{dto.isDelete},
-            </if>
-            <if test="dto.inputUnitNo != null">
-                input_unit_no = #{dto.inputUnitNo},
-            </if>
-            <if test="dto.maintenanceContract != null">
-                maintenance_contract = #{dto.maintenanceContract},
-            </if>
-            <if test="dto.maintenanceCycle != null">
-                maintenance_cycle = #{dto.maintenanceCycle},
-            </if>
-            <if test="dto.overhaulCycle != null">
-                overhaul_cycle = #{dto.overhaulCycle},
-            </if>
-            <if test="dto.equNum != null">
-                equ_num = #{dto.equNum},
-            </if>
-            <if test="dto.instanceId != null">
-                instance_id = #{dto.instanceId},
-            </if>
-            <if test="dto.promoter != null">
-                promoter = #{dto.promoter}
-            </if>
-        </set>
-        WHERE sequence_nbr = #{dto.sequenceNbr}
-    </update>
+
     <update id="updatePromoter">
         UPDATE amos_tzs_biz.tzs_jg_maintenance_contract set promoter = null
         where sequence_nbr = #{id}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintenanceContractController.java

@@ -13,6 +13,8 @@ import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintenanceContractServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +23,6 @@ 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.Map;
 
 /**
@@ -70,21 +71,6 @@ public class JgMaintenanceContractController extends BaseController {
     }
 
     /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @PostMapping(value = "/updateBySequenceNbr")
-    @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新维保合同备案", notes = "根据sequenceNbr更新维保合同备案")
-    public ResponseModel<Object> updateBySequenceNbr(@RequestBody JgMaintenanceContractDto dto,
-                                                     @RequestParam("sequenceNbr") Long sequenceNbr) {
-        dto.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(dto));
-    }
-
-    /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
@@ -93,11 +79,9 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam("sequenceNbr") Long sequenceNbr) {
-        JgMaintenanceContractDto jgMaintenanceContractDto = new JgMaintenanceContractDto();
-        jgMaintenanceContractDto.setSequenceNbr(sequenceNbr);
-        jgMaintenanceContractDto.setIsDelete(true);
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateBySequenceNbr(jgMaintenanceContractDto));
+    public ResponseModel<Object> deleteBySequenceNbr(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        jgMaintenanceContractServiceImpl.deleteForBatch(new Long[]{sequenceNbr});
+        return ResponseHelper.buildResponse("success");
     }
 
     /**

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

@@ -168,17 +168,6 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         return vo;
     }
 
-
-    /**
-     * 根据sequenceNbr更新数据
-     *
-     * @param dto
-     * @return
-     */
-    public Boolean updateBySequenceNbr(JgMaintenanceContractDto dto) {
-        return maintenanceContractMapper.updateBySequenceNbr(dto);
-    }
-
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public void flowExecute(Long id, String instanceId, String operate, String comment, Boolean update, String nextTaskId) {
@@ -253,17 +242,11 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @GlobalTransactional(rollbackFor = Exception.class)
     public Boolean deleteForBatch(Long[] ids) {
         List<Long> list = Arrays.asList(ids);
-        list.forEach(x -> {
-            QueryWrapper<JgMaintenanceContract> wrapper = new QueryWrapper<>();
-            wrapper.eq("sequence_nbr", x);
-            JgMaintenanceContract jgMaintenanceContract = maintenanceContractMapper.selectOne(wrapper);
-            LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>().eq(JgMaintenanceContractEq::getEquipTransferId, jgMaintenanceContract.getApplyNo()).eq(JgMaintenanceContractEq::getIsDelete, false);
-            List<Long> listSeq = jgMaintenanceContractEqService.list(queryWrapper).stream().map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
-
+        list.forEach(seq -> {
+            JgMaintenanceContract jgMaintenanceContract = this.baseMapper.selectById(seq);
             commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()),jgMaintenanceContract.getInstanceId());
-            maintenanceContractEqMapper.deleteForBatch(listSeq);
+            this.baseMapper.deleteById(seq);
         });
-        maintenanceContractMapper.deleteForBatch(list);
         return true;
     }