diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java index 8068b3e..54672f6 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.dao.master; import com.lyms.platform.permission.model.CheckItemManage; +import com.lyms.platform.permission.model.CheckItemManageQuery; import java.util.List; @@ -15,4 +16,7 @@ public interface MasterCheckItemManageMapper { public Integer deleteCheckItemManage(Integer id); public Integer updateCheckItemManage(CheckItemManage checkItemManage); + + + public List queryCheckItemManage(CheckItemManageQuery checkItemManageQuery); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java index 3b658b7..b04d164 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java @@ -8,7 +8,7 @@ public interface MasterCheckItemMapper { public List getCheckItemList(); - public List getOne(Integer id); + public String getOne(Integer id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java index 8aba9b1..c6a82ec 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java @@ -1,32 +1,19 @@ package com.lyms.platform.permission.model; -import java.util.List; -import java.util.Map; - public class CheckItemManage { private Integer id; private Integer startWeek; private Integer endWeek; private String checkItemInfoId; private String affiliateId; - private List checkItemInfoName; - - private Map ItemInfoIdMap; - - public Map getItemInfoIdMap() { - return ItemInfoIdMap; - } - - public void setItemInfoIdMap(Map itemInfoIdMap) { - ItemInfoIdMap = itemInfoIdMap; - } + private String checkItemInfoName; - public List getCheckItemInfoName() { + public String getCheckItemInfoName() { return checkItemInfoName; } - public void setCheckItemInfoName(List checkItemInfoName) { + public void setCheckItemInfoName(String checkItemInfoName) { this.checkItemInfoName = checkItemInfoName; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManageQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManageQuery.java new file mode 100644 index 0000000..5186b92 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManageQuery.java @@ -0,0 +1,24 @@ +package com.lyms.platform.permission.model; + +import com.lyms.platform.common.dao.BaseQuery; + +public class CheckItemManageQuery extends BaseQuery { + private Integer id; + private String affiliateId; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getAffiliateId() { + return affiliateId; + } + + public void setAffiliateId(String affiliateId) { + this.affiliateId = affiliateId; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java index 0ab73d3..2eb6e52 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.service; import com.lyms.platform.permission.model.CheckItemManage; +import com.lyms.platform.permission.model.CheckItemManageQuery; import java.util.List; @@ -14,4 +15,6 @@ public interface CheckItemManageService { public Integer deleteCheckItemManage(Integer id); public Integer updateCheckItemMagage(CheckItemManage checkItemManage); + + public List queryCheckItemManage(CheckItemManageQuery checkItemManageQuery); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java index cde1790..4c0dce0 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java @@ -9,7 +9,7 @@ public interface CheckItemService { public List getCheckItemList(); - public List getOne(Integer id); + public String getOne(Integer id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java index 327ce16..c288928 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java @@ -2,6 +2,7 @@ package com.lyms.platform.permission.service.impl; import com.lyms.platform.permission.dao.master.MasterCheckItemManageMapper; import com.lyms.platform.permission.model.CheckItemManage; +import com.lyms.platform.permission.model.CheckItemManageQuery; import com.lyms.platform.permission.service.CheckItemManageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,4 +40,9 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { public Integer updateCheckItemMagage(CheckItemManage checkItemManage) { return checkItemManageMapper.updateCheckItemManage(checkItemManage); } + + @Override + public List queryCheckItemManage(CheckItemManageQuery checkItemManageQuery) { + return checkItemManageMapper.queryCheckItemManage(checkItemManageQuery); + } } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java index 6ea0130..f51e309 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java @@ -21,7 +21,7 @@ public class CheckItemServiceImpl implements CheckItemService { } @Override - public List getOne(Integer id) { + public String getOne(Integer id) { return checkItemMapper.getOne(id); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml index f1336f6..80acd10 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml @@ -11,7 +11,7 @@ SELECT id,project FROM lyms_week_project - + SELECT project FROM lyms_week_project WHERE id=#{id,jdbcType=INTEGER} diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml index b4a4cb0..91abe4a 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml @@ -49,4 +49,26 @@ where id = #{id,jdbcType=INTEGER} + + + + order by ${sort} + + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java index d1708f3..e6a8aa0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java @@ -7,7 +7,9 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.CheckItemManage; +import com.lyms.platform.permission.model.CheckItemManageQuery; import com.lyms.platform.permission.service.CheckItemManageService; import com.lyms.platform.permission.service.CheckItemService; import com.lyms.platform.permission.service.OrganizationService; @@ -20,7 +22,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Controller @RequestMapping("/checkItemManage") @@ -39,37 +43,65 @@ public class CheckItemManageController extends BaseController { */ @RequestMapping(value = "/getCheckItemManageList", method = RequestMethod.GET) @ResponseBody - public BaseResponse getCheckItemManageList(@RequestParam(value = "affiliateId") String affiliateId) { + public FrontEndResult getCheckItemManageList(@RequestParam(value = "affiliateId") String affiliateId, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit) { + CheckItemManageQuery checkItemManageQuery = new CheckItemManageQuery(); + checkItemManageQuery.setNeed("true"); + checkItemManageQuery.setSort("modified desc"); + checkItemManageQuery.setPage(page); + checkItemManageQuery.setLimit(limit); + checkItemManageQuery.setAffiliateId(affiliateId); + List checkItemManagesList = checkItemManageService.queryCheckItemManage(checkItemManageQuery); if (StringUtils.isNotEmpty(affiliateId)) { - List checkItemManagesList = checkItemManageService.getCheckItemManage(affiliateId); for (CheckItemManage checkItemManage : checkItemManagesList) { - List list = new ArrayList(); + ArrayList lists = new ArrayList<>(); String ItemInfoId = checkItemManage.getCheckItemInfoId(); String[] str = ItemInfoId.split(","); String string = organizationService.getOrganizationName(checkItemManage.getAffiliateId()); checkItemManage.setAffiliateId(string); for (String s : str) { - List list1 = checkItemService.getOne(Integer.valueOf(s).intValue()); - list.add(list1); + String str1 = checkItemService.getOne(Integer.valueOf(s).intValue()); + lists.add(str1); } - checkItemManage.setCheckItemInfoName(list); + + checkItemManage.setCheckItemInfoName(this.listToString(lists)); } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(checkItemManagesList); + } else { - List checkItemManageList = checkItemManageService.getCheckItemManageList(); - for (CheckItemManage checkItemManage : checkItemManageList) { + for (CheckItemManage checkItemManage : checkItemManagesList) { String ItemInfoId = checkItemManage.getCheckItemInfoId(); String[] str = ItemInfoId.split(","); - List list = new ArrayList(); + ArrayList lists = new ArrayList<>(); for (String s : str) { - List list1 = checkItemService.getOne(Integer.valueOf(s).intValue()); - list.add(list1); - checkItemManage.setCheckItemInfoName(list); + String str1 = checkItemService.getOne(Integer.valueOf(s).intValue()); + lists.add(str1); } + checkItemManage.setCheckItemInfoName(this.listToString(lists)); } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(checkItemManageList); } + FrontEndResult frontEndResult = new FrontEndResult(); + frontEndResult.setPageInfo(checkItemManageQuery.getPageInfo()); + frontEndResult.setData(checkItemManagesList); + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS); + return frontEndResult; + } + public String listToString(ArrayList stringList) { + if (stringList == null) { + return null; + } + StringBuilder result = new StringBuilder(); + boolean flag = false; + for (String string : stringList) { + if (flag) { + result.append(","); // 分隔符 + } else { + flag = true; + } + result.append(string); + } + return result.toString(); }