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 c6643978..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(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/entity/AddDetailedDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java index 16549400..a57f67fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java @@ -39,7 +39,7 @@ public class AddDetailedDto { @ApiModelProperty(value = "上传的附件") private MultipartFile[] files; @ApiModelProperty(value = "要添加的清单id") - private String[] lawsIds; + private String inforlist; public MultipartFile getFiles(int i) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java index 7a1bd94d..5241c8af 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java @@ -54,7 +54,7 @@ public class DetailedUpDto { private String reNewPeople; @ApiModelProperty(value = "要添加的清单id") - private String[] lawsIds; + private String inforlist; @ApiModelProperty(value = "清单详情") private String remark; 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 630485b4..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 @@ -9,6 +9,7 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto; import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList; import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto; import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService; +import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,8 +20,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; /** *

@@ -41,6 +41,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl idList) { @@ -81,7 +83,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl page = new Page<>(pages, size); IPage userIPage = sarLawsDetailedListDao.selectPage(page, wrapper); + Map map= iDicTypeEOService.getDicTypeListCode(); + List list= userIPage.getRecords(); + List> arr = (List>)map.get("COUNTRY"); + for (SarLawsDetailedList list1:list){ + if (list1.getCountryArea().contains(",")){ + String[] split = list1.getCountryArea().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:arr) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + list1.setCountryArea(completedString); + }else { + for (Map map1:arr) { + if (map1.get("value").equals(list1.getCountryArea())){ + list1.setCountryArea(map1.get("label")); + break; + } + } + } + } + userIPage.setRecords(list); System.out.println("总条数" + userIPage.getTotal()); System.out.println("总页数" + userIPage.getPages()); return userIPage; @@ -158,7 +190,9 @@ 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}