jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ddae0550e9e6347dfcca7b697efaf3e5eb8b2e65

Authored by wangbo
1 parent 84038b12b6
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

小程序配置项修改1

Showing 11 changed files with 113 additions and 35 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemManageMapper.java View file @ ddae055
1 1 package com.lyms.platform.permission.dao.master;
2 2  
3 3 import com.lyms.platform.permission.model.CheckItemManage;
  4 +import com.lyms.platform.permission.model.CheckItemManageQuery;
4 5  
5 6 import java.util.List;
6 7  
... ... @@ -15,5 +16,8 @@
15 16 public Integer deleteCheckItemManage(Integer id);
16 17  
17 18 public Integer updateCheckItemManage(CheckItemManage checkItemManage);
  19 +
  20 +
  21 + public List<CheckItemManage> queryCheckItemManage(CheckItemManageQuery checkItemManageQuery);
18 22 }
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java View file @ ddae055
... ... @@ -8,7 +8,7 @@
8 8  
9 9 public List<CheckItem> getCheckItemList();
10 10  
11   - public List getOne(Integer id);
  11 + public String getOne(Integer id);
12 12  
13 13  
14 14 }
platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManage.java View file @ ddae055
1 1 package com.lyms.platform.permission.model;
2 2  
3 3  
4   -import java.util.List;
5   -import java.util.Map;
6   -
7 4 public class CheckItemManage {
8 5 private Integer id;
9 6 private Integer startWeek;
10 7 private Integer endWeek;
11 8 private String checkItemInfoId;
12 9 private String affiliateId;
13   - private List checkItemInfoName;
  10 + private String checkItemInfoName;
14 11  
15   - private Map<String, List> ItemInfoIdMap;
16   -
17   - public Map<String, List> getItemInfoIdMap() {
18   - return ItemInfoIdMap;
19   - }
20   -
21   - public void setItemInfoIdMap(Map<String, List> itemInfoIdMap) {
22   - ItemInfoIdMap = itemInfoIdMap;
23   - }
24   -
25   - public List getCheckItemInfoName() {
  12 + public String getCheckItemInfoName() {
26 13 return checkItemInfoName;
27 14 }
28 15  
29   - public void setCheckItemInfoName(List checkItemInfoName) {
  16 + public void setCheckItemInfoName(String checkItemInfoName) {
30 17 this.checkItemInfoName = checkItemInfoName;
31 18 }
32 19  
platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItemManageQuery.java View file @ ddae055
  1 +package com.lyms.platform.permission.model;
  2 +
  3 +import com.lyms.platform.common.dao.BaseQuery;
  4 +
  5 +public class CheckItemManageQuery extends BaseQuery {
  6 + private Integer id;
  7 + private String affiliateId;
  8 +
  9 + public Integer getId() {
  10 + return id;
  11 + }
  12 +
  13 + public void setId(Integer id) {
  14 + this.id = id;
  15 + }
  16 +
  17 + public String getAffiliateId() {
  18 + return affiliateId;
  19 + }
  20 +
  21 + public void setAffiliateId(String affiliateId) {
  22 + this.affiliateId = affiliateId;
  23 + }
  24 +}
platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java View file @ ddae055
1 1 package com.lyms.platform.permission.service;
2 2  
3 3 import com.lyms.platform.permission.model.CheckItemManage;
  4 +import com.lyms.platform.permission.model.CheckItemManageQuery;
4 5  
5 6 import java.util.List;
6 7  
... ... @@ -14,5 +15,7 @@
14 15 public Integer deleteCheckItemManage(Integer id);
15 16  
16 17 public Integer updateCheckItemMagage(CheckItemManage checkItemManage);
  18 +
  19 + public List<CheckItemManage> queryCheckItemManage(CheckItemManageQuery checkItemManageQuery);
17 20 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java View file @ ddae055
... ... @@ -9,7 +9,7 @@
9 9  
10 10 public List<CheckItem> getCheckItemList();
11 11  
12   - public List getOne(Integer id);
  12 + public String getOne(Integer id);
13 13  
14 14  
15 15 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java View file @ ddae055
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.permission.dao.master.MasterCheckItemManageMapper;
4 4 import com.lyms.platform.permission.model.CheckItemManage;
  5 +import com.lyms.platform.permission.model.CheckItemManageQuery;
5 6 import com.lyms.platform.permission.service.CheckItemManageService;
6 7 import org.springframework.beans.factory.annotation.Autowired;
7 8 import org.springframework.stereotype.Service;
... ... @@ -38,6 +39,11 @@
38 39 @Override
39 40 public Integer updateCheckItemMagage(CheckItemManage checkItemManage) {
40 41 return checkItemManageMapper.updateCheckItemManage(checkItemManage);
  42 + }
  43 +
  44 + @Override
  45 + public List<CheckItemManage> queryCheckItemManage(CheckItemManageQuery checkItemManageQuery) {
  46 + return checkItemManageMapper.queryCheckItemManage(checkItemManageQuery);
41 47 }
42 48 }
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java View file @ ddae055
... ... @@ -21,7 +21,7 @@
21 21 }
22 22  
23 23 @Override
24   - public List getOne(Integer id) {
  24 + public String getOne(Integer id) {
25 25 return checkItemMapper.getOne(id);
26 26 }
27 27  
platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml View file @ ddae055
... ... @@ -11,8 +11,8 @@
11 11 SELECT id,project FROM lyms_week_project
12 12 </select>
13 13  
14   - <select id="getOne" resultMap="CheckItemMap" parameterType="java.lang.Integer">
15   - SELECT id,project FROM lyms_week_project WHERE id=#{id,jdbcType=INTEGER}
  14 + <select id="getOne" resultType="java.lang.String" parameterType="java.lang.Integer">
  15 + SELECT project FROM lyms_week_project WHERE id=#{id,jdbcType=INTEGER}
16 16 </select>
17 17 </mapper>
platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItemManage.xml View file @ ddae055
... ... @@ -49,5 +49,27 @@
49 49 </set>
50 50 where id = #{id,jdbcType=INTEGER}
51 51 </update>
  52 +
  53 + <sql id="orderAndLimit">
  54 + <if test="sort != null and sort != '' ">
  55 + order by ${sort}
  56 + <if test="need != null">
  57 + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
  58 + </if>
  59 + </if>
  60 + </sql>
  61 +
  62 +
  63 + <select id="queryCheckItemManage" resultMap="CheckItemManageMap"
  64 + parameterType="com.lyms.platform.permission.model.CheckItemManageQuery">
  65 + SELECT id,startweek,endweek,checkItemInfoId,affiliate from lyms_checkitem
  66 + <if test="affiliateId!=null and affiliateId!=''">
  67 + where
  68 + affiliate=#{affiliateId,jdbcType=VARCHAR}
  69 + </if>
  70 + <include refid="orderAndLimit"/>
  71 + </select>
  72 +
  73 +
52 74 </mapper>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java View file @ ddae055
... ... @@ -7,7 +7,9 @@
7 7 import com.lyms.platform.common.result.BaseResponse;
8 8 import com.lyms.platform.common.utils.ResultUtils;
9 9 import com.lyms.platform.common.utils.StringUtils;
  10 +import com.lyms.platform.operate.web.result.FrontEndResult;
10 11 import com.lyms.platform.permission.model.CheckItemManage;
  12 +import com.lyms.platform.permission.model.CheckItemManageQuery;
11 13 import com.lyms.platform.permission.service.CheckItemManageService;
12 14 import com.lyms.platform.permission.service.CheckItemService;
13 15 import com.lyms.platform.permission.service.OrganizationService;
14 16  
... ... @@ -20,7 +22,9 @@
20 22  
21 23 import javax.servlet.http.HttpServletResponse;
22 24 import java.util.ArrayList;
  25 +import java.util.HashMap;
23 26 import java.util.List;
  27 +import java.util.Map;
24 28  
25 29 @Controller
26 30 @RequestMapping("/checkItemManage")
27 31  
28 32  
29 33  
30 34  
31 35  
32 36  
33 37  
34 38  
35 39  
36 40  
37 41  
38 42  
... ... @@ -39,37 +43,65 @@
39 43 */
40 44 @RequestMapping(value = "/getCheckItemManageList", method = RequestMethod.GET)
41 45 @ResponseBody
42   - public BaseResponse getCheckItemManageList(@RequestParam(value = "affiliateId") String affiliateId) {
  46 + public FrontEndResult getCheckItemManageList(@RequestParam(value = "affiliateId") String affiliateId,
  47 + @RequestParam(value = "page", required = false) Integer page,
  48 + @RequestParam(value = "limit", required = false) Integer limit) {
  49 + CheckItemManageQuery checkItemManageQuery = new CheckItemManageQuery();
  50 + checkItemManageQuery.setNeed("true");
  51 + checkItemManageQuery.setSort("modified desc");
  52 + checkItemManageQuery.setPage(page);
  53 + checkItemManageQuery.setLimit(limit);
  54 + checkItemManageQuery.setAffiliateId(affiliateId);
  55 + List<CheckItemManage> checkItemManagesList = checkItemManageService.queryCheckItemManage(checkItemManageQuery);
43 56 if (StringUtils.isNotEmpty(affiliateId)) {
44   - List<CheckItemManage> checkItemManagesList = checkItemManageService.getCheckItemManage(affiliateId);
45 57 for (CheckItemManage checkItemManage : checkItemManagesList) {
46   - List list = new ArrayList();
  58 + ArrayList<String> lists = new ArrayList<>();
47 59 String ItemInfoId = checkItemManage.getCheckItemInfoId();
48 60 String[] str = ItemInfoId.split(",");
49 61 String string = organizationService.getOrganizationName(checkItemManage.getAffiliateId());
50 62 checkItemManage.setAffiliateId(string);
51 63 for (String s : str) {
52   - List list1 = checkItemService.getOne(Integer.valueOf(s).intValue());
53   - list.add(list1);
  64 + String str1 = checkItemService.getOne(Integer.valueOf(s).intValue());
  65 + lists.add(str1);
54 66 }
55   - checkItemManage.setCheckItemInfoName(list);
  67 +
  68 + checkItemManage.setCheckItemInfoName(this.listToString(lists));
56 69 }
57   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(checkItemManagesList);
  70 +
58 71 } else {
59   - List<CheckItemManage> checkItemManageList = checkItemManageService.getCheckItemManageList();
60   - for (CheckItemManage checkItemManage : checkItemManageList) {
  72 + for (CheckItemManage checkItemManage : checkItemManagesList) {
61 73 String ItemInfoId = checkItemManage.getCheckItemInfoId();
62 74 String[] str = ItemInfoId.split(",");
63   - List list = new ArrayList();
  75 + ArrayList<String> lists = new ArrayList<>();
64 76 for (String s : str) {
65   - List list1 = checkItemService.getOne(Integer.valueOf(s).intValue());
66   - list.add(list1);
67   - checkItemManage.setCheckItemInfoName(list);
  77 + String str1 = checkItemService.getOne(Integer.valueOf(s).intValue());
  78 + lists.add(str1);
68 79 }
  80 + checkItemManage.setCheckItemInfoName(this.listToString(lists));
69 81 }
70   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(checkItemManageList);
71 82 }
  83 + FrontEndResult frontEndResult = new FrontEndResult();
  84 + frontEndResult.setPageInfo(checkItemManageQuery.getPageInfo());
  85 + frontEndResult.setData(checkItemManagesList);
  86 + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  87 + return frontEndResult;
  88 + }
72 89  
  90 + public String listToString(ArrayList<String> stringList) {
  91 + if (stringList == null) {
  92 + return null;
  93 + }
  94 + StringBuilder result = new StringBuilder();
  95 + boolean flag = false;
  96 + for (String string : stringList) {
  97 + if (flag) {
  98 + result.append(","); // 分隔符
  99 + } else {
  100 + flag = true;
  101 + }
  102 + result.append(string);
  103 + }
  104 + return result.toString();
73 105 }
74 106  
75 107