全过程功能修改

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -39,6 +39,7 @@ import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.DictService;
+import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -97,6 +98,8 @@ public class ContractController extends BaseController {
     private ProjectControlTableService projectControlTableService;
     @Autowired
     private ActTaskService actTaskService;
+    @Autowired
+    private UserService userService;
 
     /*@ModelAttribute
     public ConstructionContract get(@RequestParam(required=false) String id) {
@@ -562,6 +565,11 @@ public class ContractController extends BaseController {
             /**获取项目的附件信息*/
             follow.setWorkAttachments(projectImplementEarlyService.getWorkattachment(projectFollowReport));
             follow.setProjectContentData(projectContentData);
+
+            //查询真实总审人员信息
+            List<User> auditUserList = userService.getAuditUserListByType("2");
+            follow.setBzshbUserList(auditUserList);
+
             /**获取项目的附件信息*/
             model.addAttribute("projectFollowReport", follow);
             if("view".equals(projectFollowReport.getView())){
@@ -570,6 +578,10 @@ public class ContractController extends BaseController {
             return "modules/projectrecord/workContentFromAndView/workFollowForm";
         }
 
+        //查询真实总审人员信息
+        List<User> auditUserList = userService.getAuditUserListByType("2");
+        projectFollowReport.setBzshbUserList(auditUserList);
+
         //查询是否含有上传或者引用的依据性文件信息
         if(StringUtils.isNotBlank(id)){
             List<ProjectControlTable> controlData = projectControlTableService.getControlData(id,"");
@@ -646,7 +658,11 @@ public class ContractController extends BaseController {
             if ("modifyApply".equals(taskDefKey)) {
                 projectFollowReport.getAct().setComment("重新申请");
             }
-            List<User> users = UserUtils.getByProssType(projectFollowReport.getProcessInstanceId(),1);
+            //List<User> users = UserUtils.getByProssType(projectFollowReport.getProcessInstanceId(),1);
+            List<User>  users = Lists.newArrayList();
+            //添加总审人员
+            User auditUser = UserUtils.get(projectFollowReport.getBzshbUserId());
+            users.add(auditUser);
             String flag = projectFollowReport.getAct().getFlag();
             if ("yes".equals(flag) && (users==null || users.size()==0)){
                 addMessage(redirectAttributes, "审批失败,审批人为空,请联系管理员！");
@@ -700,6 +716,9 @@ public class ContractController extends BaseController {
             projectFollowReport.setAct(act);
         }
 
+        //查询真实总审人员信息
+        List<User> auditUserList = userService.getAuditUserListByType("2");
+        projectFollowReport.setBzshbUserList(auditUserList);
         model.addAttribute("projectFollowReport", projectFollowReport);
         return "modules/projectrecord/workContentFromAndView/workFollowModify";
     }
@@ -768,4 +787,4 @@ public class ContractController extends BaseController {
         }
         return j;
     }
-}
+}

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectFollowReport.java

@@ -47,6 +47,8 @@ public class ProjectFollowReport extends ActEntity<ProjectFollowReport> {
 
 
     private List<Workattachment> workAttachments;
+    private List<User> bzshbUserList;  //总审用户信息
+    private String bzshbUserId;     //审核人员id
 
 
     public ProjectRecords getProject() {
@@ -178,4 +180,20 @@ public class ProjectFollowReport extends ActEntity<ProjectFollowReport> {
     public void setParentIds(String parentIds) {
         this.parentIds = parentIds;
     }
+
+    public List<User> getBzshbUserList() {
+        return bzshbUserList;
+    }
+
+    public void setBzshbUserList(List<User> bzshbUserList) {
+        this.bzshbUserList = bzshbUserList;
+    }
+
+    public String getBzshbUserId() {
+        return bzshbUserId;
+    }
+
+    public void setBzshbUserId(String bzshbUserId) {
+        this.bzshbUserId = bzshbUserId;
+    }
 }

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -29,6 +29,7 @@ import java.util.List;
 public class ProjectRecords extends ActEntity<ProjectRecords> {
 
 	public static final String SERIAL_BIZCODE ="1";
+	public static final String SERIAL_BIZCODE_ALL ="151";
 	private static final long serialVersionUID = 1L;
 	@NotNull(message = "合同信息不能为空")
 	private WorkContractInfo workContractInfo;		// 合同id

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectImplementEarlyService.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.projectrecord.service;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
@@ -353,8 +354,13 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
 
             //获取初始审核人员list信息
             List<User> users = new ArrayList<>();
-            List<User> bmzrs = UserUtils.getByRoleActivityEnname("bzshb",3,office.getId(),"4",projectFollowReport.getCreateBy());
-
+            //List<User> bmzrs = UserUtils.getByRoleActivityEnname("bzshb",3,office.getId(),"4",projectFollowReport.getCreateBy());
+            List<User> bmzrs = Lists.newArrayList();
+            //总工
+            User bzshbsUser = UserUtils.get(projectFollowReport.getBzshbUserId());
+            if(null != bzshbsUser){
+                bmzrs.add(bzshbsUser);
+            }
             if (StringUtils.isNotBlank(workActivityMenu.getId())) {
                 processType = workActivityMenu.getProcessType();
                 workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -459,7 +459,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
         }
 
 		if(StringUtils.isBlank(projectRecords.getProjectId())){
-            projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(),ProjectRecords.SERIAL_BIZCODE));
+            projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(),ProjectRecords.SERIAL_BIZCODE_ALL));
         }
 		//保存项目登记信息
         if(projectRecords.getProjectStatus()==ProjectStatusEnum.INVALID.getValue()){

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -288,7 +288,8 @@ public class ProjectEarlyReviewController extends BaseController {
             //判断是否为空
             if (null != contentAttachmentData) {
                 try {
-                    projectBasedData.setTemporaryUrl(workattachmentService.fileUrlManage(projectBasedData.getFileUrl()));
+                    projectBasedData.setFileUrl(workattachmentService.fileUrlManage(workattachmentService.fileUrlManageOnPrefix(contentAttachmentData.getFileUrl())));
+                    projectBasedData.setTemporaryUrl(workattachmentService.fileUrlManage(workattachmentService.fileUrlManageOnPrefix(contentAttachmentData.getFileUrl())));
                     MyBeanUtils.copyBeanNotNull2Bean(contentAttachmentData, projectBasedData);
                 }catch (Exception e) {
                     e.printStackTrace();

src/main/resources/mappings/modules/projectrecord/ProjectFollowReport/ProjectFollowReport.xml

@@ -75,7 +75,8 @@
         a.create_by AS "createBy.id",
         a.create_date AS "createDate",
         a.status as "status",
-        a.process_instance_id as "processInstanceId"
+        a.process_instance_id as "processInstanceId",
+        a.bzshb_user_id as "bzshbUserId"
         FROM sj_project_registration a
         <where>
             a.projectId = #{projectId}
@@ -111,7 +112,8 @@
          del_flag,
          projectFollowId,
          projectFollowName,
-         projectId)
+         projectId,
+         bzshb_user_id)
         VALUES (#{id},
                 #{createBy.id},
                 #{createDate},
@@ -120,7 +122,8 @@
                 #{delFlag},
                 #{projectFollowId},
                 #{projectFollowName},
-                #{projectId})
+                #{projectId},
+                #{bzshbUserId})
     </insert>
 
     <insert id="insertFollow">
@@ -134,7 +137,8 @@
          projectFollowId,
          projectFollowName,
          status,
-         projectId)
+         projectId,
+         bzshb_user_id)
         VALUES (#{id},
                 #{createBy.id},
                 #{createDate},
@@ -144,7 +148,8 @@
                 #{projectFollowId},
                 #{projectFollowName},
                 #{status},
-                #{project.id})
+                #{project.id},
+                #{bzshbUserId})
     </insert>
 
     <update id="update">
@@ -155,6 +160,9 @@
             projectFollowName = #{projectFollowName},
             projectId = #{project.id},
             status = #{status}
+            <if test="bzshbUserId != null and bzshbUserId != ''">
+                ,bzshb_user_id = #{bzshbUserId}
+            </if>
         where id = #{id};
     </update>
 
@@ -181,4 +189,4 @@
         WHERE id = #{id}
     </update>
 
-</mapper>
+</mapper>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportForm.jsp

@@ -220,7 +220,7 @@
                 multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0");
             }
         }
-        
+
         function selectNum() {
 			top.layer.open({
 				type: 2,
@@ -713,7 +713,7 @@
 										<c:when test="${ projectBasedData.flag =='according'}">
 											<c:choose>
 												<c:when test="${not empty projectBasedData.fileUrl}">
-													<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${projectBasedData.fileUrl}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+													<a href="${projectBasedData.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:when>
 												<c:otherwise>
 													<a href=javascript:void(0); onclick="accordingBtn(this, '#workBaseDataList${idx.index}','${projectBasedData.uploadUser.id}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
@@ -1297,4 +1297,4 @@
 
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workFollowForm.jsp

@@ -34,7 +34,11 @@
         var detailFlag =0;
         function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-
+                var bzshbUserId = $("#bzshbUserId").val();
+                if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
+                    parent.layer.msg("请选择审核人员!", {icon: 5});
+                    return false;
+                }
                 var length = document.getElementById("workBaseDataList");
                 var rows = length.rows.length;
                 var idList = [];
@@ -203,7 +207,7 @@
             $(prefix+"_file").val(123)
         }
 
-        
+
         function changeContentDetail(obj) {
             var val = $(obj).val();
             var modify = $("#modify").val();
@@ -604,6 +608,17 @@
                                value="<fmt:formatDate value="${projectFollowReport.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
+                    <div class="layui-input-block">
+                        <select class="form-control judgment layui-input" id="bzshbUserId"  name="bzshbUserId">
+                            <option value=""/>
+                            <c:forEach items="${projectFollowReport.bzshbUserList}" var="user" varStatus="status">
+                                <option value="${user.id}" <c:if test="${projectFollowReport.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </div>
             </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>内容详情</h2></div>
@@ -974,7 +989,7 @@
         data: [
         ]
     })
-    
+
     function getExistingDataOnPath(val) {
         switch (val){
             case '22':
@@ -1204,4 +1219,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workFollowModify.jsp

@@ -34,7 +34,11 @@
         var detailFlag =0;
         function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
-
+                /*var bzshbUserId = $("#bzshbUserId").val();
+                if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
+                    parent.layer.msg("请选择审核人员!", {icon: 5});
+                    return false;
+                }*/
                 var length = document.getElementById("workBaseDataList");
                 var rows = length.rows.length;
                 var idList = [];
@@ -203,7 +207,7 @@
             $(prefix+"_file").val(123)
         }
 
-        
+
         function changeContentDetail(obj) {
             var val = $(obj).val();
             var modify = $("#modify").val();
@@ -571,6 +575,7 @@
             <input type="hidden" id="projectContentDataSign" name="projectContentDataSign" value="">
             <input type="hidden" id="modify"  value="${modify}">
             <form:hidden path="home"/>
+            <form:hidden path="bzshbUserId"/>
             <form:hidden path="act.taskId"/>
             <form:hidden path="act.taskName"/>
             <form:hidden path="act.taskDefKey"/>
@@ -611,6 +616,17 @@
                                value="<fmt:formatDate value="${projectFollowReport.createDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
+                <%--<div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
+                    <div class="layui-input-block">
+                        <select class="form-control judgment layui-input" id="bzshbUserId"  name="bzshbUserId">
+                            <option value=""/>
+                            <c:forEach items="${projectFollowReport.bzshbUserList}" var="user" varStatus="status">
+                                <option value="${user.id}" <c:if test="${projectFollowReport.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </div>--%>
             </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>内容详情</h2></div>
@@ -988,7 +1004,7 @@
         data: [
         ]
     })
-    
+
     function getExistingDataOnPath(val) {
         switch (val){
             case '22':
@@ -1218,4 +1234,4 @@
     }
 </script>
 </body>
-</html>
+</html>