Merge branch 'master' of http://192.168.2.4:3000/chengqiang/total_process

src/main/java/com/jeeplus/modules/workbidproject/dao/WorkBidProjectDao.java

@@ -123,6 +123,10 @@ public interface WorkBidProjectDao extends CrudDao<WorkBidProject> {
 	public WorkBidProject getByPId(WorkProject workProject);
 
 
+	/**
+	 * 根據Id 修改 更新時間
+	 * @param workBidProject
+	 */
     void updateForTans(WorkBidProject workBidProject);
 
     //更新投标保证金交付提醒标记

src/main/java/com/jeeplus/modules/workbidproject/service/WorkBidProjectService.java

@@ -512,6 +512,9 @@ public class WorkBidProjectService extends CrudService<WorkBidProjectDao, WorkBi
 		variables.put("type", processType);
 		variables.put("busId", businessKey);
 		variables.put("title", "审批单：" + workBidProject.getProjectNumber());//设置标题；
+		variables.put("fgldcount",users.size());
+		variables.put("fgldList",users);
+
 		long begin3 = System.currentTimeMillis();
 		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
 		long end4 = System.currentTimeMillis();

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -510,6 +510,7 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	public int saveContractPrice(WorkContractInfo workContractInfo) {
 		return dao.saveContractPrice(workContractInfo);
 	}
+
 	@Transactional(readOnly = false)
 	public void save(WorkContractInfo workContractInfo) {
 		super.save(workContractInfo);
@@ -695,6 +696,8 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 		variables.put("type", processType);
 		variables.put("busId", businessKey);
+		variables.put("count",users.size());
+		variables.put("assigneeList",users);
 		variables.put("title", "合同名称:" + workContractInfo.getName());//设置标题；
 		long s1 = System.currentTimeMillis();
 		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
@@ -964,6 +967,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 						notifyRole = "市场研发管理部负责人";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
+						vars.put("ywbzrcount",auditUsers.size());
+						vars.put("ywbzrList",auditUsers);
+
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");
@@ -1310,6 +1316,8 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 						notifyRole = "市场研发管理部负责人";
 						workActivityProcess.setIsApproval("1");
 						enname = "scyfglbzr";
+
+
 					} else {
 						notifyRole = "调整申请";
 						workActivityProcess.setIsApproval("2");

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -634,7 +634,7 @@ public class WorkContractInfoController extends BaseController {
      */
     @RequestMapping(value = "saveAlterAudit")
     public String saveAlterAudit(WorkContractInfo workContractInfo,Map<String, Object> vars, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) {
-        try{
+//        try{
             // 对不同环节的业务逻辑进行操作
             String taskDefKey = workContractInfo.getAct().getTaskDefKey();
             List<User> users = null;
@@ -658,9 +658,9 @@ public class WorkContractInfoController extends BaseController {
                 String str = workContractInfoService.auditAlterSave(workContractInfo,users);
                 addMessage(redirectAttributes, str);
             }
-        }catch (Exception e){
-            addMessage(redirectAttributes, "审批失败");
-        }
+//        }catch (Exception e){
+//            addMessage(redirectAttributes, "审批失败");
+//        }
         model.addAttribute("workContractInfo", workContractInfo);
         if (StringUtils.isNotBlank(workContractInfo.getHome()) && "home".equals(workContractInfo.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
@@ -754,6 +754,7 @@ public class WorkContractInfoController extends BaseController {
                 }
                 workContractInfo.setWorkAttachments(list1);
                 WorkContractInfo t = workContractInfoService.get(workContractInfo.getId());//从数据库取出记录的值
+//                status =2,审核中。status=5,审核已通过
                 if (t.getContractState().equals("2")) {
                     addMessage(redirectAttributes, "审核中的合同不能修改");
                     return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
@@ -769,10 +770,12 @@ public class WorkContractInfoController extends BaseController {
                 t.setSignatureStatus("1");
                 workContractInfoService.save(t);
                 workContractInfoService.updateWorkContractInfo(workContractInfo);
-                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
-                workContractReview.setWorkAttachments(list2);
-                workContractReview.setContractName(workContractInfo.getName());
-                workContractReviewService.save(workContractReview);
+
+//                合同评价信息，
+//                WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
+//                workContractReview.setWorkAttachments(list2);
+//                workContractReview.setContractName(workContractInfo.getName());
+//                workContractReviewService.save(workContractReview);
                 Map<String, Object> variables = new HashMap<String, Object>();
                 t.setContractState("2");
                 String str=workContractInfoService.save(t, variables,contextPath,url);//保存
@@ -795,6 +798,7 @@ public class WorkContractInfoController extends BaseController {
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 for (WorkClientAttachment workClientAttachment:list){
                     if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                        //  flag = 44 代表合同附件 ，
                         list1.add(workClientAttachment);
                     }else {
                         list2.add(workClientAttachment);
@@ -806,12 +810,15 @@ public class WorkContractInfoController extends BaseController {
                 workContractInfo.setSignatureStatus("1");
                 workContractInfoService.save(workContractInfo);//暂存
                 workContractInfoService.updateWorkContractInfo(workContractInfo);
+
+                /* 合同评价信息
                 WorkContractReview workContractReview = workContractInfo.getWorkContractReview();
                 String id = workContractInfo.getId();
                 workContractReview.setContractId(id);
                 workContractReview.setWorkAttachments(list2);
                 workContractReview.setContractName(workContractInfo.getName());
-                workContractReviewService.save(workContractReview);
+                workContractReviewService.save(workContractReview);*/
+
                 workContractInfo.setContractState("2");
                 Map<String, Object> variables = new HashMap<String, Object>();
                String str= workContractInfoService.save(workContractInfo, variables,contextPath,url);//保存

src/main/resources/mappings/modules/workbidproject/WorkBidProjectDao.xml

@@ -642,8 +642,8 @@
 	</insert>
 
     <update id="updateForTans">
-        UPDATE work_bid_project SET
-		update_date = #{updateDate}
+        UPDATE work_bid_project
+		SET	update_date = #{updateDate}
 		WHERE id = #{id}
     </update>
 

src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -59,7 +59,7 @@
                         <div class="layui-tab" id="tabDiv">
                             <ul class="layui-tab-title" >
                                 <li class="active"><a data-toggle="tab" href="#tab-11"  aria-expanded="true">合同信息</a></li>
-                                <li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>
+<%--                                <li ><a data-toggle="tab" href="#tab-22"  aria-expanded="false">合同评审信息</a></li>--%>
                             </ul>
                         </div>
 					</ul>
@@ -331,145 +331,7 @@
                             </div>
                         </div>
 
-                        <div id="tab-22" class="tab-pane">
 
-                            <div class="form-group layui-row first lw14">
-                                <div class="form-group-label"><h2>评审基础信息</h2></div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label">时间要求：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.workContractReview.timeRequirements}"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label">特殊要求：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.workContractReview.specialRequirements}"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label">客户要求是否合法：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line">客户诚信度的初步判断：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.credibility eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.credibility eq 2}">中</c:when><c:otherwise>高</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label">风险初步评价：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 1}">低</c:when><c:when test="${workContractInfo.workContractReview.preliminaryRiskAssessmen eq 2}">高</c:when><c:otherwise>中</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line">被服务对象所处行业环境：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.serviceObjectIndustry eq 1}">正常</c:when><c:otherwise>不正常</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line">与服务有关的客户资料能否恰当获取：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isProperAcquisition eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line">人员是否能专业胜任：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isUserQualified eq 1}">是</c:when><c:otherwise>否</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line">是否需要借助外部专家力量：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isLegitimate eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line">设备能否满足项目要求：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isEquipmentMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line">时间能否满足客户需求：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isTimeMeetRequirements eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm6">
-                                    <label class="layui-form-label double-line">合同是否可以签定：</label>
-                                    <div class="layui-input-block">
-                                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<c:choose><c:when test="${workContractInfo.workContractReview.isContractSignature eq 1}">需要</c:when><c:otherwise>不需要</c:otherwise></c:choose>"/>
-                                    </div>
-                                </div>
-                                <div class="layui-item layui-col-sm12">
-                                    <label class="layui-form-label">备注信息：</label>
-                                    <div class="layui-input-block">
-                                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.workContractReview.remarks}</textarea>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group layui-row">
-                                <div class="form-group-label"><h2>合同评审附件信息</h2></div>
-                                <div class="layui-item layui-col-xs12 form-table-container" >
-                                    <table id="contentTable2" class="table table-bordered table-condensed no-bottom-margin details">
-                                        <thead>
-                                        <tr>
-                                            <th>文件</th>
-                                            <th>上传人</th>
-                                            <th>上传时间</th>
-                                            <th width="180px">操作</th>
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        <c:choose>
-                                            <c:when test="${not empty workContractInfo.workContractReview.workAttachments}">
-                                                <c:forEach items="${workContractInfo.workContractReview.workAttachments}" var="workClientAttachment" varStatus="status">
-                                                    <tr>
-                                                            <%--<td>${status.index + 1}</td>--%>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                        <td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                        <td>${workClientAttachment.createBy.name}</td>
-                                                        <td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
-                                                        <td  class="op-td">
-                                                            <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                        </td>
-                                                    </tr>
-                                                </c:forEach>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <tr>
-                                                    <td colspan="4" align="center">暂无数据</td>
-                                                </tr>
-                                            </c:otherwise>
-                                        </c:choose>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
                     </div>
                 </div>
                 <div class="form-group layui-row">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -599,8 +599,8 @@
                         }
                         if(d.canalterComDel != undefined && d.canalterComDel =="1")
                         {
-                           /* xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗？', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";
-                            */xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/deleteCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该合同完成吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                           <%--/* xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗？', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";*/--%>
+							xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/deleteCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该合同完成吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
                         }
 
                         return xml;