分包商模版配置和待审核通知功能开发

src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/SetTemplateBean.java

@@ -38,4 +38,6 @@ public class SetTemplateBean {
     private String standard;
     private String dutyDept;
     private String isUse;
+    private Integer isEnable;
+    private Integer configId;
 }

src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java

@@ -10,6 +10,7 @@ import com.bonus.gs.sub.evaluate.manager.model.SysUser;
 import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes;
 import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst;
 import com.bonus.gs.sub.evaluate.manager.utils.UserUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/SetTemplateController.java

@@ -11,10 +11,7 @@ import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -45,6 +42,22 @@ public class SetTemplateController {
         return ar;
     }
 
+    @RequestMapping(value = "changeEnable", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxRes changeEnable(SetTemplateBean o){
+        AjaxRes ar = new AjaxRes();
+        Integer i = service.changeEnable(o);
+        if (i > 0){
+            ar.setRes(GlobalConst.SUCCEED);
+            ar.setResMsg("启用成功");
+            return ar;
+        }else {
+            ar.setRes(GlobalConst.FAIL);
+            ar.setFailMsg("启用失败");
+            return ar;
+        }
+    }
+
     @RequestMapping("deleteTemplateById")
     @ResponseBody
     public AjaxRes deleteTemplateById(String id) {

src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/SetTemplateDao.java

@@ -63,4 +63,8 @@ public interface SetTemplateDao {
      * @return
      */
     List<SetTemplateBean> getResponsibleDepartmentSelect(SetTemplateBean bean);
+
+    Integer changeEnable(SetTemplateBean o);
+
+    void setTemplatePass();
 }

src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateService.java

@@ -25,4 +25,6 @@ public interface SetTemplateService {
      * @return
      */
     AjaxRes addTemplate(SetTemplateBean o);
+
+    Integer changeEnable(SetTemplateBean o);
 }

src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/SetTemplateServiceImpl.java

@@ -101,6 +101,14 @@ public class SetTemplateServiceImpl implements SetTemplateService {
         return ar;
     }
 
+    @Override
+    public Integer changeEnable(SetTemplateBean o) {
+        // 先全部改为未启用状态
+        dao.setTemplatePass();
+        // 再把当前模板改成启用
+        return dao.changeEnable(o);
+    }
+
     public static List<SetTemplateBean> convertJsonToBeans(String jsonString) {
         JSONArray jsonArray = JSONArray.parseArray(jsonString);
         List<SetTemplateBean> templateBeans = new ArrayList<>();

src/main/java/com/bonus/gs/sub/evaluate/manager/controller/PermissionController.java

@@ -1,16 +1,22 @@
 package com.bonus.gs.sub.evaluate.manager.controller;
 
-import java.util.Collections;
+import java.util.*;
-import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.bonus.gs.sub.evaluate.evaluate.beans.OutSourceBean;
+import com.bonus.gs.sub.evaluate.evaluate.beans.TeamEvaluateBean;
+import com.bonus.gs.sub.evaluate.evaluate.dao.OutsourcerEvaluateDao;
+import com.bonus.gs.sub.evaluate.evaluate.service.OutsourcerEvaluateService;
+import com.bonus.gs.sub.evaluate.evaluate.service.TeamEvaluateService;
 import com.bonus.gs.sub.evaluate.manager.annotation.LogAnnotation;
 import com.bonus.gs.sub.evaluate.manager.dao.PermissionDao;
 import com.bonus.gs.sub.evaluate.manager.entity.LoginUser;
 import com.bonus.gs.sub.evaluate.manager.model.Permission;
 import com.bonus.gs.sub.evaluate.manager.service.PermissionService;
+import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes;
+import com.bonus.gs.sub.evaluate.manager.utils.GlobalConst;
 import com.bonus.gs.sub.evaluate.manager.utils.UserUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
@@ -31,18 +37,28 @@ import com.google.common.collect.Lists;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import javax.annotation.Resource;
+
 /**
  * 权限相关接口
  */
 @Api(tags = "权限")
 @RestController
 @RequestMapping("/permissions")
+@Slf4j
 public class PermissionController {
 
     @Autowired
     private PermissionDao permissionDao;
     @Autowired
     private PermissionService permissionService;
+    @Resource
+    private OutsourcerEvaluateService outsourcerEvaluateService;
+    @Resource
+    private OutsourcerEvaluateDao outsourcerEvaluateDao;
+
+    @Autowired
+    private TeamEvaluateService service;
 
     @ApiOperation(value = "当前登录用户拥有的权限")
     @GetMapping("/current")
@@ -61,9 +77,70 @@ public class PermissionController {
             setChild(p, permissions);
         });
 
+        List<OutSourceBean> outSourceBeans = checkExamine(new OutSourceBean());
+        List<TeamEvaluateBean> teamEvaluateBeans = TeamEvaluateBean(new TeamEvaluateBean());
+        for (Permission permission : firstLevel) {
+            permission.getChild().forEach(c -> {
+                if (c.getHref().equals("pages/evaluate/outsourceAudit/outsourceAuditList.html")) {
+                    for (OutSourceBean outSourceBean : outSourceBeans) {
+                        if ((Integer.parseInt(outSourceBean.getEvaluateNum())) > 0 && (Integer.parseInt(outSourceBean.getIsApprove())) == 0){
+                            c.setIsCheckWBS(1);
+                        }
+                    }
+                }
+                if (c.getHref().equals("pages/evaluate/team/evaluateCheckList.html")) {
+                    for (TeamEvaluateBean teamEvaluateBean : teamEvaluateBeans) {
+                        if ("5".equals(loginUser.getRoleId()) ||
+                                Arrays.asList(loginUser.getRoleId().split(",")).contains("5")) {
+                            if ("1".equals(teamEvaluateBean.getStatus())) {
+                                if ("待审核".equals(teamEvaluateBean.getCheckStatus())) {
+                                    c.setIsCheckBZ(1);
+                                }
+                            }
+                        }
+                        if ("6".equals(loginUser.getRoleId()) ||
+                                Arrays.asList(loginUser.getRoleId().split(",")).contains("6")) {
+                            if (!"1".equals(teamEvaluateBean.getStatus())) {
+                                if ("待审核".equals(teamEvaluateBean.getCheckStatus())) {
+                                    c.setIsCheckBZ(1);
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+        }
         return firstLevel;
     }
 
+    private List<OutSourceBean> checkExamine(OutSourceBean o) {
+        try {
+            o.setDeptId(UserUtil.getLoginUser().getDeptId());
+            String isBusinessDivision = outsourcerEvaluateDao.getIsBusinessDivision(o.getDeptId());
+            if (!org.apache.commons.lang3.StringUtils.isBlank(isBusinessDivision) && "1".equals(isBusinessDivision)) {
+                o.setIsBusinessDivision("1");
+            } else {
+                o.setIsBusinessDivision("0");
+            }
+            List<OutSourceBean> list = outsourcerEvaluateService.getEvaluateAuditList(o);
+            return list;
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+        }
+        return new ArrayList<>();
+    }
+    private List<TeamEvaluateBean> TeamEvaluateBean(TeamEvaluateBean o) {
+        List<TeamEvaluateBean> list = service.getTeamEvaluateList(o);
+        for (TeamEvaluateBean bean : list) {
+            String sendPhone = bean.getSendPhone();
+            if (org.apache.commons.lang3.StringUtils.isBlank(sendPhone)) {
+                String sendPhone2 = service.getSendPhone(bean);
+                bean.setSendPhone(sendPhone2);
+            }
+        }
+        return list;
+    }
+
     /**
      * 设置子元素
      * 2018.06.09

src/main/java/com/bonus/gs/sub/evaluate/manager/model/Permission.java

@@ -14,6 +14,26 @@ public class Permission extends BaseEntity<Long> {
 	private String permission;
 	private Integer sort;
 
+	private Integer isCheckBZ;
+
+	public Integer getIsCheckBZ() {
+		return isCheckBZ;
+	}
+
+	public void setIsCheckBZ(Integer isCheckBZ) {
+		this.isCheckBZ = isCheckBZ;
+	}
+
+	public Integer getIsCheckWBS() {
+		return isCheckWBS;
+	}
+
+	public void setIsCheckWBS(Integer isCheckWBS) {
+		this.isCheckWBS = isCheckWBS;
+	}
+
+	private Integer isCheckWBS;
+
 	private List<Permission> child;
 
 	public Long getParentId() {

src/main/resources/download/evaluate_model.ftl

@@ -1345,6 +1345,9 @@
                             </w:rPr>
                             <w:jc w:val="right"/>
                         </w:pPr>
+                        <w:r>
+                            <w:br/> <w:br/> <w:br/>
+                        </w:r>
                         <w:r>
                             <w:rPr>
                                 <w:rFonts w:hint="eastAsia" w:ascii="仿宋" w:hAnsi="仿宋" w:eastAsia="仿宋"

src/main/resources/mappers/evaluate/SetTemplateMapper.xml

@@ -24,6 +24,16 @@
             version = version + 1
         where config_id = #{id}
     </update>
+    <update id="setTemplatePass">
+        update pj_template_config
+        set is_enable = 1
+        where is_active = '1'
+    </update>
+    <update id="changeEnable">
+        update pj_template_config
+        set is_enable = 0
+        where config_id = #{configId}
+    </update>
     <delete id="deleteTemplateById">
         update pj_template_config set is_active = '0' where config_id = #{id}
     </delete>
@@ -36,6 +46,7 @@
         ptc.create_time as createTime,
         ptc.version as version,
         ptc.json as jsonTxt,
+        ptc.is_enable as isEnable,
         ifnull(per.evaluate_id, 0) as isUse
         FROM
             pj_template_config ptc

src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml

@@ -104,7 +104,7 @@
                config_name as name,
                version     as version
           from pj_template_config
-         where is_active = 1
+         where is_active = 1 and is_enable  = 0
     </select>
     <select id="getOrgTree" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.NodeBean">
         SELECT id,