Merge branch 'pre-production' into dev

blade-biz-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -41,13 +41,13 @@ public class LauncherServiceImpl implements LauncherService {
 		PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
 
 
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
-//		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
 
-		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
 
+		PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
+		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.username","nacos");
+		PropsUtil.setProperty(props,  "spring.cloud.nacos.discovery.password","Nacos123123");
+		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.username","nacos");
+		PropsUtil.setProperty(props,  "spring.cloud.nacos.config.password","Nacos123123");
 		// dubbo注册
 		PropsUtil.setProperty(props, "dubbo.application.name", appName);
 		PropsUtil.setProperty(props, "dubbo.application.qos.enable", "false");

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java

@@ -39,5 +39,7 @@ public class ClassifyVO extends ClassifyEntity {
 
 	private List<PointsEntity> pointsEntities = new ArrayList<>();
 
+	private List<PointsVO> pointsVOS ;
+
 
 }

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java

@@ -2,7 +2,6 @@ package com.logpm.supervise.vo.api;
 
 
 import com.logpm.supervise.entity.ClassifyEntity;
-import com.logpm.supervise.entity.PointsEntity;
 import com.logpm.supervise.vo.PointsVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -511,7 +511,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			log.error("参数缺失,signforId:{}", distributionSignforDTO.getId());
 			return null;
 		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss.SSS");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 		DistributionSignforEntity distributionSignfor = this.getById(distributionSignforDTO.getId());
 		BladeUser user = AuthUtil.getUser();
 		distributionSignfor.setExamineUserId(user.getUserId());

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java

@@ -62,11 +62,12 @@ public class ClassifyApi {
 	@GetMapping("/myApiIndicatorsDetail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "我的考核列表")
-	public R myApiIndicatorsDetail(@RequestParam Long Id) {
-		R r = classifyService.myApiIndicatorsDetail(Id);
+	public R myApiIndicatorsDetail(@RequestParam Long id) {
+		R r = classifyService.myApiIndicatorsDetail(id);
 		return r;
 	}
 
+
 	@PostMapping("/updateApiIndicators")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "小程序保存考核内容", notes = "传入classify")

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml

@@ -56,7 +56,7 @@
     </select>
     <select id="selectAllClassifyList" resultType="com.logpm.supervise.vo.api.ClassifyApiVO">
         SELECT * FROM sup_classify WHERE is_deleted = 0
-        <if test="pid != null and pid = 0">
+        <if test="pid != null and pid == 0">
             and p_id = 0
         </if>
         <if test="pid != null and pid != 0">

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsAnnexMapper.xml

@@ -8,8 +8,8 @@
     <select id="findListByIndicatorsIdAndType" resultType="com.logpm.supervise.entity.IndicatorsAnnexEntity">
         select *
         from sup_indicators_annex
-        where indicators_id = #{indicatorsId}
-        and `type` = #{type}
+        where and indicators_id = #{id}
+        and type = #{type}
     </select>
 
 </mapper>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -9,6 +9,7 @@
                sc.name classifyName,
                psc.id parentClassifyId,
                psc.name parentClassifyName,
+               psc.id parentClassifyId,
                si.assess_dept_name assessDeptName,
                si.assess_user_name assessUserName,
                si.point point,

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -254,16 +254,20 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		// 增加当前选择部门的负责人
 
 		R<List<User>> listR = userClient.userInfoByDept(user.getTenantId(), instanceofDTO.getAssessDept());
+		log.info(">>>>>>>>>>>>> listR  {}",listR);
 		Long userId=null;
 		String userName=null;
 		if(listR.isSuccess()){
 			List<User> data = listR.getData();
 			// 获取仓库经理ID
 			R<String> roleIs = sysClient.getRoleIds(user.getTenantId(), "仓库经理");
+			log.info(">>>>>>>>>>>>> roleIs  {}",roleIs);
+
 			if(roleIs.isSuccess()){
 				String roleId = roleIs.getData();
 				for (User datum : data) {
-					if(datum.getPostId().contains(roleId)){
+					log.info(">>>>>>  women  datum {}",datum);
+					if(datum.getRoleId().contains(roleId)){
 						userId=datum.getId();
 						userName=datum.getRealName();
 					}