Merge branch 'tzq' into 'develop'

Tzq

See merge request 8timerv2/8timerapiv200!142

src/main/java/cn/timer/api/controller/LoginController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
@@ -433,6 +434,26 @@ public class LoginController {
 
 
 		return ResultUtil.error("修改手机号/用户名失败");
 		return ResultUtil.error("修改手机号/用户名失败");
 	}
 	}
+	
+	/**
+	 * 是否有账号
+	 * 
+	 * @return
+	 */
+	@GetMapping(value = "/user")
+	@ApiOperation(value = "5.是否有账号", httpMethod = "GET", notes = "是否有账号")
+	@ApiOperationSupport(order = 5)
+	public Result<String> updatephone(@CurrentUser UserBean userBean, @RequestParam String phone) {
+		
+		QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
+				.eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one();
+		
+		if (login == null) {
+			return ResultUtil.success("0");
+		}
+		
+		return ResultUtil.success("1");
+	}
 
 
 	@Autowired
 	@Autowired
 	SpmkServiceImpl SpmkService;
 	SpmkServiceImpl SpmkService;

src/main/java/cn/timer/api/controller/jxgl/service/JxglService.java

+package cn.timer.api.controller.jxgl.service;
+
+public interface JxglService {
+
+}

src/main/java/cn/timer/api/controller/jxgl/service/JxglServiceImpl.java

+package cn.timer.api.controller.jxgl.service;
+
+public class JxglServiceImpl implements JxglService {
+
+}

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

@@ -138,7 +138,7 @@
                 b.id JxglProcessNode_id,
                 b.id JxglProcessNode_id,
                 b.appraisal_id JxglProcessNode_appraisal_id,
                 b.appraisal_id JxglProcessNode_appraisal_id,
                 b.executor_id JxglProcessNode_executor_id,
                 b.executor_id JxglProcessNode_executor_id,
-                b.executor_name JxglProcessNode_executor_name,
+                <!-- b.executor_name JxglProcessNode_executor_name, -->
                 b.execute_type JxglProcessNode_execute_type,
                 b.execute_type JxglProcessNode_execute_type,
                 b.process_type JxglProcessNode_process_type,
                 b.process_type JxglProcessNode_process_type,
                 b.name JxglProcessNode_name,
                 b.name JxglProcessNode_name,
@@ -314,6 +314,7 @@
         SELECT 
         SELECT 
         	<include refid="Base_Column_List_a" />,
         	<include refid="Base_Column_List_a" />,
         	<include refid="Base_Column_List_Alias_b" />,
         	<include refid="Base_Column_List_Alias_b" />,
+        	i.name JxglProcessNode_executor_name,
         	<include refid="Base_Column_List_Alias_c" />,
         	<include refid="Base_Column_List_Alias_c" />,
         	<include refid="Base_Column_List_Alias_d" />,
         	<include refid="Base_Column_List_Alias_d" />,
         	<include refid="Base_Column_List_Alias_e" />,
         	<include refid="Base_Column_List_Alias_e" />,
@@ -329,6 +330,7 @@
         LEFT JOIN jxgl_appraisal_indicators_assessment f ON e.id = f.appraisal_indicators_id
         LEFT JOIN jxgl_appraisal_indicators_assessment f ON e.id = f.appraisal_indicators_id
         LEFT JOIN jxgl_appraisal_item g ON e.id = g.appraisal_indicators_id
         LEFT JOIN jxgl_appraisal_item g ON e.id = g.appraisal_indicators_id
         LEFT JOIN jxgl_performance_appraisal h ON a.performance_appraisal_id = h.id
         LEFT JOIN jxgl_performance_appraisal h ON a.performance_appraisal_id = h.id
+        LEFT JOIN yggl_main_emp i ON b.executor_id = i.emp_num AND i.org_code = #{orgCode}
         WHERE a.id = #{id}
         WHERE a.id = #{id}
         ORDER BY c.id , d.id
         ORDER BY c.id , d.id
     </select>
     </select>

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

@@ -185,15 +185,15 @@
 	<select id="selectListEmpByQuery" resultMap="BaseResultMap_ALl" >
 	<select id="selectListEmpByQuery" resultMap="BaseResultMap_ALl" >
         SELECT 
         SELECT 
         	a.name,a.appraisal_start_time,a.appraisal_end_time,
         	a.name,a.appraisal_start_time,a.appraisal_end_time,
-        	b.sts b_sts,
+        	b.id b_id, b.sts b_sts,
         	(SELECT name FROM yggl_main_emp WHERE emp_num = d.executor_id AND org_code = a.org_code) as b_executor_name,
         	(SELECT name FROM yggl_main_emp WHERE emp_num = d.executor_id AND org_code = a.org_code) as b_executor_name,
         	c.comprehensive_score c_comprehensive_score,
         	c.comprehensive_score c_comprehensive_score,
         	c.level c_level
         	c.level c_level
 		FROM jxgl_performance_appraisal a
 		FROM jxgl_performance_appraisal a
 		LEFT JOIN jxgl_appraisal b ON b.performance_appraisal_id = a.id
 		LEFT JOIN jxgl_appraisal b ON b.performance_appraisal_id = a.id
-		LEFT JOIN jxgl_appraisal_assessment c ON b.id = c.appraisal_id
+		LEFT JOIN jxgl_appraisal_assessment c ON b.id = c.appraisal_id AND c.type = 1
 		LEFT JOIN jxgl_process_node d ON b.id = d.appraisal_id AND d.sts = 1
 		LEFT JOIN jxgl_process_node d ON b.id = d.appraisal_id AND d.sts = 1
-		WHERE a.org_code = #{param.orgCode} AND b.emp_num = #{param.id} AND c.type = 1
+		WHERE a.org_code = #{param.orgCode} AND b.emp_num = #{param.id}
 
 
     </select>
     </select>