Merge branch 'tzq' into 'develop'

绩效-待评分、已评分搜索优化

See merge request 8timerv2/8timerapiv200!218

src/main/java/cn/timer/api/controller/jxgl/JxglController.java

@@ -302,7 +302,10 @@ public class JxglController {
 		IPage<JxglAppraisalT> p = new Page<JxglAppraisalT>(page.getCurrentPage(), page.getTotalPage());
 		IPage<JxglAppraisalT> p = new Page<JxglAppraisalT>(page.getCurrentPage(), page.getTotalPage());
 
 
 		IPage<JxglAppraisalT> pageAT = jxglAppraisalTMapper.selectPage(p,
 		IPage<JxglAppraisalT> pageAT = jxglAppraisalTMapper.selectPage(p,
-				new QueryWrapper<JxglAppraisalT>().lambda().eq(JxglAppraisalT::getOrgCode, userBean.getOrgCode()));
+				new QueryWrapper<JxglAppraisalT>().lambda()
+				.eq(JxglAppraisalT::getOrgCode, userBean.getOrgCode())
+				.orderByDesc(JxglAppraisalT::getId)
+				);
 
 
 		List<JxglAppraisalT> listAT = pageAT.getRecords();
 		List<JxglAppraisalT> listAT = pageAT.getRecords();
 
 
@@ -1102,6 +1105,12 @@ public class JxglController {
 		IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage());
 		IPage<JxglPerformanceAppraisal> page = new Page<JxglPerformanceAppraisal>(query.getCurrentPage(),query.getTotalPage());
 		query.setOrgCode(userBean.getOrgCode());
 		query.setOrgCode(userBean.getOrgCode());
 		query.setId(userBean.getEmpNum());
 		query.setId(userBean.getEmpNum());
+		
+		// 当查询的数据不为  2评分,清空 节点状态
+		if (query.getSts() != 2) {
+			query.setNoteSts(null);
+		}
+		
 		IPage<JxglPerformanceAppraisal> pagePA = jxglPerformanceAppraisalMapper.selectMyByQuery(page, query);
 		IPage<JxglPerformanceAppraisal> pagePA = jxglPerformanceAppraisalMapper.selectMyByQuery(page, query);
 
 
 		List<JxglPerformanceAppraisal> listPA = pagePA.getRecords();
 		List<JxglPerformanceAppraisal> listPA = pagePA.getRecords();

src/main/java/cn/timer/api/dto/jxgl/MyPerformance.java

@@ -21,5 +21,8 @@ public class MyPerformance extends Page {
 
 
 	@ApiModelProperty(value = "状态 0目标填写 1目标确认 2评分 3 结果确认", example = "")
 	@ApiModelProperty(value = "状态 0目标填写 1目标确认 2评分 3 结果确认", example = "")
 	private Integer sts;
 	private Integer sts;
-
+	
+	@ApiModelProperty(value = "状态 1执行中 2已执行 ", example = "")
+	private Integer noteSts;
+	
 }
 }

src/main/resources/mapping/jxgl/JxglAppraisalMapper.xml

@@ -347,7 +347,6 @@
 		</where>
 		</where>
 		GROUP BY a.emp_num
 		GROUP BY a.emp_num
         ORDER BY a.id DESC
         ORDER BY a.id DESC
-        	
     </select>
     </select>
 
 
 	<select id="selectDetailById" resultMap="BaseResultMap_Detail">
 	<select id="selectDetailById" resultMap="BaseResultMap_Detail">

src/main/resources/mapping/jxgl/JxglPerformanceAppraisalMapper.xml

@@ -206,7 +206,7 @@
 		LEFT JOIN jxgl_process_node d ON b.id = d.appraisal_id AND b.sts = d.process_type
 		LEFT JOIN jxgl_process_node d ON b.id = d.appraisal_id AND b.sts = d.process_type
 		LEFT JOIN yggl_main_emp e ON b.emp_num = e.emp_num AND a.org_code = e.org_code
 		LEFT JOIN yggl_main_emp e ON b.emp_num = e.emp_num AND a.org_code = e.org_code
 		WHERE a.org_code = #{param.orgCode} AND b.emp_num = #{param.id}
 		WHERE a.org_code = #{param.orgCode} AND b.emp_num = #{param.id}
-
+		ORDER BY a.id DESC
     </select>
     </select>
     
     
     <select id="selectMyByQuery" resultMap="BaseResultMap_ALl" >
     <select id="selectMyByQuery" resultMap="BaseResultMap_ALl" >
@@ -239,7 +239,11 @@
 			<if test="param.sts != null and param.sts == 3">
 			<if test="param.sts != null and param.sts == 3">
 				AND b.sts = 4
 				AND b.sts = 4
 			</if>
 			</if>
+			<if test="param.noteSts != null">
+				AND d.sts = #{param.noteSts}
+			</if>
 		</where>
 		</where>
+		ORDER BY a.id DESC
 		
 		
     </select>
     </select>