项目检查功能

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralPeojectRecordChooseCheckService.java

@@ -299,9 +299,10 @@ public class RuralPeojectRecordChooseCheckService extends CrudService<RuralPeoje
      */
     @Transactional(readOnly = false)
     public String auditSave(RuralProjectRecords projectRecords, List<User> auditUsers) throws Exception {
+        String taskDefKey = projectRecords.getAct().getTaskDefKey();
         RuralProjectRecords records = this.get(projectRecords.getId());
         //设置当前审核中总审人员流程信息
-        if (StringUtils.isBlank(records.getBzshbUserId())) {
+        if (StringUtils.isBlank(records.getBzshbUserId()) && !"no1".equals(projectRecords.getAct().getFlag()) && !"modifyApply".equals(taskDefKey)) {
             //获取总审用户信息
             User bzshbUser = UserUtils.get(projectRecords.getBzshbUserId());
             List<User> bzshbList = Lists.newArrayList();
@@ -310,7 +311,6 @@ public class RuralPeojectRecordChooseCheckService extends CrudService<RuralPeoje
 
         }
         int checkStatus = projectRecords.getCheckStatus();
-        String taskDefKey = projectRecords.getAct().getTaskDefKey();
         if (!"modifyApply".equals(taskDefKey) && !taskDefKey.contains("audit") ) {
             actTaskService.claim(projectRecords.getAct().getTaskId(), UserUtils.getUser().getId());
         }else {

src/main/resources/jeeplus.properties

@@ -7,12 +7,10 @@ jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
 #jdbc.url=jdbc:mysql://192.168.2.4:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
-#jdbc.url=jdbc:mysql://127.0.0.1:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
-jdbc.url=jdbc:mysql://192.168.2.6:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
-#jdbc.url=jdbc:mysql://192.168.2.4:3306/new_ccpm_clear?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://127.0.0.1:3306/simple_xg_total_process?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
-jdbc.password=123456
-#jdbc.password=root
+#jdbc.password=123456
+jdbc.password=root
 
 #pool settings
 jdbc.pool.init=20

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsAudit.jsp

@@ -11,6 +11,11 @@
             if(validateForm.form()){
                 if(obj == 1) {
                     $("#flag").val("yes");
+                    var bzshbUserId = $("#bzshbUserId").val();
+                    if(undefined == bzshbUserId || null == bzshbUserId || '' == bzshbUserId){
+						parent.layer.msg("请选择项目审核人员!", {icon: 5});
+						return false;
+					}
                 }else {
                     if(obj == 2){
                         $("#flag").val("no1");
@@ -233,7 +238,7 @@
 						<div class="layui-item layui-col-sm6 lw7">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>项目审核人员：</label>
 							<div class="layui-input-block">
-								<select class="form-control required editable-select layui-input" id="bzshbUserId" disabled="disabled" name="bzshbUserId">
+								<select class="form-control editable-select layui-input" id="bzshbUserId" disabled="disabled" name="bzshbUserId">
 									<option value=""/>
 									<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 										<option value="${user.id}" <c:if test="${projectRecords.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
@@ -246,7 +251,7 @@
 						<div class="layui-item layui-col-sm6 lw7">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>项目审核人员：</label>
 							<div class="layui-input-block">
-								<select class="form-control required editable-select layui-input" id="bzshbUserId"  name="bzshbUserId">
+								<select class="form-control editable-select layui-input" id="bzshbUserId"  name="bzshbUserId">
 									<option value=""/>
 									<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 										<option value="${user.id}">${user.name}</option>
@@ -427,49 +432,6 @@
 
 			</script>
 
-			<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="usersListTable" class="table table-bordered table-condensed no-bottom-margin details">
-						<thead>
-						<tr>
-							<th width="25%">姓名</th>
-							<th width="25%">部门</th>
-							<th width="25%">职级</th>
-							<th width="55px;">状态</th>
-						</tr>
-						</thead>
-						<tbody id="usersList">
-						<c:if test="${not empty projectRecords.projectMembers}">
-							<c:forEach items="${projectRecords.projectMembers}" var="user">
-								<tr id="${user.id}">
-									<td>
-											${user.name}
-									</td>
-									<td>
-											${user.office.name}
-									</td>
-									<td>
-											${user.basicInfo.jobGrade.name}
-									</td>
-									<td>
-										<c:choose>
-											<c:when test="${user.delFlag == 0}">
-												正常
-											</c:when>
-											<c:otherwise>
-												移除
-											</c:otherwise>
-										</c:choose>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:if>
-						</tbody>
-					</table>
-				</div>
-			</div>
-
 	</form:form>
 
 			<div class="form-group layui-row">

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsModify.jsp

@@ -202,7 +202,7 @@
                     </div>
                 </div>
 
-                <c:choose>
+                <%--<c:choose>
                     <c:when test="${not empty projectRecords.bzshbUserId}">
                         <div class="layui-item layui-col-sm6 lw7">
                             <label class="layui-form-label double-line"><span class="require-item">*</span>项目审核人员：</label>
@@ -229,7 +229,7 @@
                             </div>
                         </div>
                     </c:otherwise>
-                </c:choose>
+                </c:choose>--%>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">