Merge branch 'master' of http://124.70.43.205:3000/wangchangsheng/evaluation

ims-service/ims-eval/src/main/java/com/ims/eval/config/permission/PermissionAspect.java

@@ -3,6 +3,7 @@ package com.ims.eval.config.permission;
 import cn.hutool.core.util.ClassUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.ims.eval.cache.CacheContext;
 import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.dto.response.MyuserResDTO;
@@ -52,7 +53,7 @@ public class PermissionAspect implements Interceptor {
 
 	//扫描的包路径，需要权限的加在mapper类及方法上
 	private String packagePath = "com.ims.eval.dao";
-	private final static String DEPT_ID = "dept";
+	private final static String DEPT_ID = "dept_id";
 	private final static String DEPT_MARK = "BM0001";
 
 	/**  start  以下定义的数据需要和部门表一致       **/
@@ -204,6 +205,9 @@ public class PermissionAspect implements Interceptor {
 
 	@Cacheable(value = "user_code")
 	private MyuserResDTO getSysUser(String code) {
+		if (StringUtils.isBlank(code)){
+			return null;
+		}
 		Object json = serviceBuilder.getGatewayUrl().getSysUser(code);
 		MyuserResDTO user = JSON.parseObject(json.toString(), MyuserResDTO.class);
 		return user;

ims-service/ims-eval/src/main/java/com/ims/eval/controller/EvaluationPortalAttachController.java

@@ -0,0 +1,20 @@
+package com.ims.eval.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 考评首页附件 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+@RestController
+@RequestMapping("//evaluation-portal-attach")
+public class EvaluationPortalAttachController {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/controller/EvaluationPortalController.java

@@ -0,0 +1,20 @@
+package com.ims.eval.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 考评首页 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+@RestController
+@RequestMapping("//evaluation-portal")
+public class EvaluationPortalController {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/controller/OrganizationEvaluationInfoController.java

@@ -112,7 +112,7 @@ public class OrganizationEvaluationInfoController {
 				String originalFilename = file.getOriginalFilename();
 				//获取文件类型
 				String fileType = originalFilename.substring(originalFilename.lastIndexOf(".") + 1, originalFilename.length());
-				//默认从第一行开始读取
+				//默认从第一行开始读取,第0行为标题
 				Integer startRows = 1;
 				//获取输入流
 				InputStream is = file.getInputStream();
@@ -123,7 +123,7 @@ public class OrganizationEvaluationInfoController {
 				for (String[] str : strings) {
 					OrganizationEvaluationInfo organizationEvaluationInfo = new OrganizationEvaluationInfo();
 					organizationEvaluationInfo.setId(str[0]);
-					organizationEvaluationInfo.setQuantifiedValue(Double.parseDouble(str[8]));
+					organizationEvaluationInfo.setQuantifiedValue(Double.parseDouble(str[8].trim().equals("") ? "0" : str[8]));
 					bindingList.add(organizationEvaluationInfo);
 				}
 				boolean b = organizationEvaluationInfoService.saveOrUpdateBatch(bindingList);

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationPortalAttachMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluationPortalAttach;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评首页附件 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+public interface EvaluationPortalAttachMapper extends BaseMapper<EvaluationPortalAttach> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationPortalMapper.java

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluationPortal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评首页 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+public interface EvaluationPortalMapper extends BaseMapper<EvaluationPortal> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationPortal.java

@@ -0,0 +1,98 @@
+package com.ims.eval.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评首页
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationPortal extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 板块编码
+     */
+    private String binSection;
+
+    /**
+     * 单位名称
+     */
+    private String company;
+
+    /**
+     * 等级
+     */
+    private String grade;
+
+    /**
+     * 得分
+     */
+    private BigDecimal score;
+
+    /**
+     * 基准分
+     */
+    private BigDecimal baseScore;
+
+    /**
+     * 年
+     */
+    private Integer year;
+
+    /**
+     * 季度（1，2，3，4）
+     */
+    private Integer season;
+
+    /**
+     * 加分事项（-1扣分，0持平，1加分）
+     */
+    private Integer matterHeigh;
+
+    /**
+     * 扣分事项（-1扣分，0持平，1加分）
+     */
+    private Integer matterLow;
+
+    /**
+     * 管理加分（-1扣分，0持平，1加分）
+     */
+    private Integer manageHeigh;
+
+    /**
+     * 管理扣分（-1扣分，0持平，1加分）
+     */
+    private Integer manageLow;
+
+    /**
+     * 高于基准（-1扣分，0持平，1加分）
+     */
+    private Integer standardHeigh;
+
+    /**
+     * 低于基准（-1扣分，0持平，1加分）
+     */
+    private Integer standardLow;
+
+    /**
+     * 部门编码
+     */
+    private String deptId;
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationPortalAttach.java

@@ -0,0 +1,62 @@
+package com.ims.eval.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 考评首页附件
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluationPortalAttach extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 首页关联id
+     */
+    private String portalId;
+
+    /**
+     * 加分事项原因
+     */
+    private String matterHeighNote;
+
+    /**
+     * 扣分事项原因
+     */
+    private String matterLowNote;
+
+    /**
+     * 管理加分原因
+     */
+    private String manageHeightNote;
+
+    /**
+     * 管理扣分原因
+     */
+    private String manageLowNote;
+
+    /**
+     * 高于基准原因
+     */
+    private String standardHeighNote;
+
+    /**
+     * 低于基准原因
+     */
+    private String standardLowNote;
+
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/entity/Indicator.java

@@ -94,7 +94,7 @@ public class Indicator extends Model {
     /**
      * 部门
      */
-    private String dept;
+    private String deptId;
 
 	/**
 	 * 部门name

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationPortalAttachService.java

@@ -0,0 +1,16 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.EvaluationPortalAttach;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 考评首页附件 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+public interface IEvaluationPortalAttachService extends IService<EvaluationPortalAttach> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationPortalService.java

@@ -0,0 +1,16 @@
+package com.ims.eval.service;
+
+import com.ims.eval.entity.EvaluationPortal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 考评首页 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+public interface IEvaluationPortalService extends IService<EvaluationPortal> {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationPortalAttachServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.EvaluationPortalAttach;
+import com.ims.eval.dao.EvaluationPortalAttachMapper;
+import com.ims.eval.service.IEvaluationPortalAttachService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 考评首页附件 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+@Service
+public class EvaluationPortalAttachServiceImpl extends ServiceImpl<EvaluationPortalAttachMapper, EvaluationPortalAttach> implements IEvaluationPortalAttachService {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/EvaluationPortalServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ims.eval.service.impl;
+
+import com.ims.eval.entity.EvaluationPortal;
+import com.ims.eval.dao.EvaluationPortalMapper;
+import com.ims.eval.service.IEvaluationPortalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 考评首页 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2023-05-10
+ */
+@Service
+public class EvaluationPortalServiceImpl extends ServiceImpl<EvaluationPortalMapper, EvaluationPortal> implements IEvaluationPortalService {
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationInfoServiceImpl.java

@@ -183,7 +183,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			}
 		}
 		List<OrganizationEvaluationInfoResDTO> list = baseMapper.selectListEvaluationInfoId2(organizationEvaluationId,dept,organizationShortName,indicatorName,binSection,isQuantified,"",organizationId);//默认获取指定的怎目标
-
+		list.stream().forEach(i->{
+			i.setUpdateMark(true);
+		});
 		return list;
 	}
 

ims-service/ims-eval/src/main/resources/mappers/IndicatorMapper.xml

@@ -15,7 +15,7 @@
         <result column="is_child" property="isChild" />
         <result column="bin_section" property="binSection" />
         <result column="bin_stage" property="binStage" />
-        <result column="dept" property="dept" />
+        <result column="dept_id" property="deptId" />
         <result column="company" property="company" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
@@ -29,7 +29,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, indicator_name, indicator_code, unit, indicator_type_id, coefficient, is_quantified, is_additional, is_child, bin_section, bin_stage, dept, company, create_time, update_time, create_by, update_by, enable, remark, des, order_num
+        id, indicator_name, indicator_code, unit, indicator_type_id, coefficient, is_quantified, is_additional, is_child, bin_section, bin_stage, dept_id, company, create_time, update_time, create_by, update_by, enable, remark, des, order_num
     </sql>
 
     <select id="selectByCode" resultType="com.ims.eval.entity.Indicator">
@@ -74,8 +74,8 @@
                 AND i.bin_stage = #{binStage}
             </if>
 
-            <if test="dept !=null and dept !=''">
-                AND i.dept = #{dept}
+            <if test="dept_id !=null and dept_id !=''">
+                AND i.dept_id = #{dept}
             </if>
 
             <if test="company !=null and company !=''">
@@ -127,13 +127,13 @@
         i.*,t.type_name indicatorTypeName,
         b.stage_name binStageName,
         bs.section_name binSectionName,
-        dd.key_name deptName
+        dd.key_name dept_idName
         FROM
         indicator i
         LEFT JOIN indicator_type t  ON i.indicator_type_id = t.id
         LEFT JOIN bin_stage b  ON i.bin_stage = b.id
         LEFT JOIN bin_section bs  ON i.bin_section = bs.id
-        inner join data_dictionary dd on dd.data_key = i.dept
+        inner join data_dictionary dd on dd.data_key = i.dept_id
         <where>
 
 
@@ -156,8 +156,8 @@
                 AND i.bin_stage = #{binStage}
             </if>
 
-            <if test="dept !=null and dept !=''">
-                AND i.dept = #{dept}
+            <if test="dept_id !=null and dept_id !=''">
+                AND i.dept_id = #{dept}
             </if>
 
             <if test="company !=null and company !=''">

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationInfoMapper.xml

@@ -183,7 +183,7 @@
             and id.option_code not in ('CZ','CZMAX','CZMIN','LRGXKLMAX','LRGXKLMIN','DWQWLRMAX','DWQWLRMIN','WCLDF','LRGXKHMAX','LRGXKHMIN')
         </where>
 
-        order by be.order_num,oer.organization_short_name,bn.order_num,ri.order_num,id.child_code,id.option_code,id.option_order asc
+        order by be.order_num,oer.organization_short_name,bn.order_num,ri.order_num,id.option_order asc
 
     </select>