jiangjiazhi / regional-platform

Authored by zhangchao over 1 year ago

Exists in luanping and in 1 other branch

Showing 8 changed files with 47 additions and 5 deletions

1	1	package com.lyms.platform.permission.dao.master;
2	2
3	3	import com.lyms.platform.permission.model.ProjectWay;
	4	+import org.apache.ibatis.annotations.Param;
4	5
5	6	import java.util.List;
6	7
...	...	@@ -8,7 +9,8 @@
8	9	List<ProjectWay> getList(List<Integer> ids);
9	10	void add(ProjectWay factorProject);
10	11	void update(ProjectWay factorProject);
11		- void del(List<Integer> ids);
	12	+ void del(@Param("list") List<Integer> list);
	13	+ void delOne(Integer id);
12	14	ProjectWay selectById(Integer id);
13	15	void insertBatch(List<ProjectWay> list);
14	16	}

...	...	@@ -14,6 +14,8 @@
14	14	private Date created;
15	15	@Transient
16	16	private List<ProjectWay> wayList;
	17	+ @Transient
	18	+ private List<Integer> delIds;
17	19
18	20	public Integer getId() {
19	21	return id;
...	...	@@ -69,6 +71,14 @@
69	71
70	72	public void setWayList(List<ProjectWay> wayList) {
71	73	this.wayList = wayList;
	74	+ }
	75	+
	76	+ public List<Integer> getDelIds() {
	77	+ return delIds;
	78	+ }
	79	+
	80	+ public void setDelIds(List<Integer> delIds) {
	81	+ this.delIds = delIds;
72	82	}
73	83	}

...	...	@@ -11,6 +11,7 @@
11	11	void add(FactorProject factorProject);
12	12	void update(FactorProject factorProject);
13	13	void del(Integer id);
	14	+ void delCheck(Integer id);
14	15	FactorProject selectById(Integer id);
15	16	FactorProjectEntity selectByWeek(Integer hospitalId,String week);
16	17	FactorProject selectInfo(Integer id);

...	...	@@ -9,6 +9,7 @@
9	9	void add(ProjectWay projectWay);
10	10	void update(ProjectWay projectWay);
11	11	void del(List<Integer> ids);
	12	+ void delOne(Integer id);
12	13	void insertBatch(List<ProjectWay> list);
13	14	ProjectWay selectById(Integer id);
14	15	}

...	...	@@ -61,15 +61,21 @@
61	61	public void update(FactorProject factorProject) {
62	62	List<ProjectWay> wayList = factorProject.getWayList();
63	63	if (CollectionUtils.isNotEmpty(wayList)) {
	64	+ List<Integer> delIds= factorProject.getDelIds();
64	65	for (int i = 0, j = wayList.size(); i < j; i++) {
65	66	ProjectWay projectWay = wayList.get(i);
66	67	if (projectWay.getId() != null) {
67	68	projectWayService.update(projectWay);
	69	+ }else {
	70	+ projectWay.setFactorId(factorProject.getId());
	71	+ projectWayService.add(projectWay);
68	72	}
69	73	}
	74	+ if (CollectionUtils.isNotEmpty(delIds)){
	75	+ projectWayService.del(delIds);
	76	+ }
70	77	factorProjectMapper.update(factorProject);
71	78	}
72		-
73	79	}
74	80
75	81	@Override
...	...	@@ -87,6 +93,11 @@
87	93	factorProjectMapper.del(id);
88	94	}
89	95	}
	96	+ }
	97	+
	98	+ @Override
	99	+ public void delCheck(Integer id) {
	100	+ projectWayService.delOne(id);
90	101	}
91	102
92	103	@Override

...	...	@@ -34,6 +34,11 @@
34	34	}
35	35
36	36	@Override
	37	+ public void delOne(Integer id) {
	38	+ projectWayMapper.delOne(id);
	39	+ }
	40	+
	41	+ @Override
37	42	public void insertBatch(List<ProjectWay> list) {
38	43	projectWayMapper.insertBatch(list);
39	44	}

...	...	@@ -62,11 +62,13 @@
62	62
63	63	<delete id="del" parameterType="java.util.List">
64	64	delete from lyms_project_way where id in
65		- <if test="ids!=null and ids.size() > 0">
66		- <foreach collection="ids" item="item" open="(" close=")" separator=",">
	65	+ <foreach collection="list" item="item" open="(" close=")" separator=",">
67	66	#{item}
68	67	</foreach>
69		- </if>
	68	+ </delete>
	69	+
	70	+ <delete id="delOne" parameterType="java.lang.Integer">
	71	+ delete from lyms_project_way where id = #{id,jdbcType=INTEGER}
70	72	</delete>
71	73
72	74	<select id="selectById" resultMap="ProjectWayMap" parameterType="java.lang.Integer">

...	...	@@ -85,6 +85,16 @@
85	85	ResultUtils.buildSuccessResultAndWrite(response);
86	86	}
87	87
	88	+ @RequestMapping(value = "/delCheck", method = RequestMethod.GET)
	89	+ @TokenRequired
	90	+ public void delCheck(HttpServletResponse response, @RequestParam(value = "id") Integer id) {
	91	+ if (id == null) {
	92	+ ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空");
	93	+ }
	94	+ factorProjectService.delCheck(id);
	95	+ ResultUtils.buildSuccessResultAndWrite(response);
	96	+ }
	97	+
88	98	@Autowired
89	99	private BookbuildingFacade bookbuildingFacade;
90	100