From 9f856079eecf7c28306ccf5f858bdc29e507bd71 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 6 Jul 2021 20:14:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/FeignClient/workFlowFeignClient.java | 4 ++-- .../com/adc/da/workFlow/controller/WorkFlowController.java | 2 +- .../dao/SarLawsAttrDetailedListDao.java | 7 ++++--- .../entity/SarLawsAttrDetailedList.java | 6 +++++- .../service/impl/SarLawsDetailedListServiceImpl.java | 2 ++ .../SarLawsAttrDetailedListMapper.xml | 6 ++++-- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ca2d6fdd..81041d83 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") -//@FeignClient(value = "shan") +//@FeignClient(value = "bat-wkflow") +@FeignClient(value = "shan") public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index b72e68c9..54fecda7 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -213,7 +213,7 @@ public class WorkFlowController { @ApiOperation(value = "完成任务") @PostMapping("/completeTask") - public Wrapper completeTaskByUserId(@RequestBody BusMes busMes){ + public Wrapper completeTaskByUserId( BusMes busMes){ Wrapper str = workFlowFeignClient.completeTaskByUserId(busMes); if(str.getCode() == 500){ str.setSuccess(false); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index 573d6904..d74c7fa0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandExcelDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,10 +21,10 @@ import java.util.List; public interface SarLawsAttrDetailedListDao extends BaseMapper { //根据清单id，查出标准的id并排序 - List selectLawsId(String standId,Integer page,Integer size); + List selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 - List selectLawsById(List LawsIds,String standName); + List selectLawsById(@Param("param1") List LawsIds,@Param("standName") String standName); List selectLawsId2(String standId); - Boolean insertList(List sarLawsAttrDetailedLists); + Boolean insertList(@Param("sarLawsAttrDetailedLists") List sarLawsAttrDetailedLists); Boolean deleteByStandId(String standId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java index 056d166f..f3546b89 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarLawsAttrDetailedList.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -27,16 +28,19 @@ public class SarLawsAttrDetailedList extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") - @TableId + @TableField(value = "id") private String id; @ApiModelProperty(value = "标准政策表的id") + @TableField(value = "stand_id") private String standId; @ApiModelProperty(value = "标准清单主键") + @TableField(value = "detailed_list_id") private String detailedListId; @ApiModelProperty(value = "顺序") + @TableField(value = "number") private String number; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 60a1eef9..4e81e311 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -83,6 +83,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl order by number - LIMIT #{param3} OFFSET #{param2}; + LIMIT #{param3} , #{param2}; + INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES - + (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR}) + delete from sar_laws_attr_detailed_list where detailed_list_id=#{standId,jdbcType=VARCHAR}