1111

src/main/java/com/jeeplus/modules/sys/utils/UserUtils.java

@@ -1276,6 +1276,7 @@ public class UserUtils {
 		return users;
 	}
 
+
 	public static List<User> getByProssType(String processId,int count){
 		WorkActivityProcess workActivityProcess = new WorkActivityProcess();
 		workActivityProcess.setProcessInstanceId(processId);

src/main/java/com/jeeplus/modules/workactivity/entity/WorkActivityProcess.java

@@ -17,8 +17,8 @@ import java.util.List;
 public class WorkActivityProcess extends DataEntity<WorkActivityProcess> {
 	
 	private static final long serialVersionUID = 1L;
-	private String processKey;		// 流程标识
-	private String isApproval;		// 是否审批
+	private String processKey;			// 流程标识
+	private String isApproval;			// 是否审批
 	private String processInstanceId;		// 实例流程id
 	private int count;
 	private Activity activity;

src/main/java/com/jeeplus/modules/workbidproject/web/WorkBidProjectController.java

@@ -305,7 +305,7 @@ public class  WorkBidProjectController extends BaseController {
 	public String saveAudit(WorkBidProject workBidProject,
 							Model model,
 							RedirectAttributes redirectAttributes) {
-//		try {
+		try {
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workBidProject.getAct().getTaskDefKey();
 			String flag = workBidProject.getAct().getFlag();
@@ -351,9 +351,9 @@ public class  WorkBidProjectController extends BaseController {
 				String str = workBidProjectService.auditSave(workBidProject, users);
 				addMessage(redirectAttributes, str);
 			}
-//		} catch (Exception e) {
-//			addMessage(redirectAttributes, "审批失败");
-//		}
+		} catch (Exception e) {
+			addMessage(redirectAttributes, "审批失败");
+		}
 		if (StringUtils.isNotBlank(workBidProject.getHome()) && "home".equals(workBidProject.getHome())) {
 			return "redirect:" + Global.getAdminPath() + "/home/?repage";
 		} else {

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -32,43 +32,44 @@ import java.util.Map;
  */
 public class WorkContractInfo extends ActEntity<WorkContractInfo> {
     public static final String SERIAL_BIZCODE = "2";
+
     /*新增属性*/
 	private WorkBidProject project;		// 投标项目
-	private String projectName;		// 项目名称
+	private String projectName;			// 项目名称
 	private String ext;
-	private String alterState;       //变更状态（1暂存2审批中3驳回回4已变更5撤回字典暂弃）
+	private String alterState;       	//变更状态（1暂存2审批中3驳回回4已变更5撤回字典暂弃）
 	private String alterProcessInstanceId;//变更流程Id
-	private String alterBeforeId;     //变更前合同id
+	private String alterBeforeId;     	//变更前合同id
 	private WorkContractInfo oldWorkContractInfo;
-	private String alterSign;         //标记
-	private String recordState;        //归档状态
-	private String alterType ; //变更前中后
-	private String times;  //变更次数
+	private String alterSign;         	//标记
+	private String recordState;       	//归档状态
+	private String alterType ; 			//变更前中后
+	private String times;  				//变更次数
 /*-----------------------------------------------------------------*/
 	private static final long serialVersionUID = 1L;
 	private WorkClientInfo client;		// 客户ID(主委托方)
 	private List<WorkClientInfo> workClientInfoList = Lists.newArrayList(); //委托方列表
-	private Date contractDate;		// 签订日期
-	private Date effectiveDate;		// 合同生效日期
-	private Date closingDate;		// 合同终止日期
-	private String name;		// 合同名称
-	private String contractCategory;		//变更原因
-	private String contractNum;		// 合同编号
+	private Date contractDate;			// 签订日期
+	private Date effectiveDate;			// 合同生效日期
+	private Date closingDate;			// 合同终止日期
+	private String name;				// 合同名称
+	private String contractCategory;	//变更原因
+	private String contractNum;			// 合同编号
 	private String contractPrice;		// 合同金额(元）
-	private String contractOpposite;		// 对方合同编号
+	private String contractOpposite;	// 对方合同编号
 	private String contractType;		// 合同类型
 	private String contractTypeDoc;		//合同类型说明
-	private String contractFee;		// 收费标准
-	private String contractFeeDoc; //收费标准说明
+	private String contractFee;			// 收费标准
+	private String contractFeeDoc; 		//收费标准说明
 	private String contractSpecial;		// 合同特别条款
 	private String contractState;		// 合同状态
 	private Date beginContractDate;		// 开始 签订日期
 	private Date endContractDate;		// 结束 签订日期
-	private String chargeCompany;			//(合同所属部门)
-	private String chargeCompanyName;		//部门名称
-	private String contractFileId;			//合同文件id
-	private String contractRole;			//审批角色
-	private String applyView;		 //审核意见
+	private String chargeCompany;		//(合同所属部门)
+	private String chargeCompanyName;	//部门名称
+	private String contractFileId;		//合同文件id
+	private String contractRole;		//审批角色
+	private String applyView;		 	//审核意见
 	private String processInstanceId;
 	private String companyId;
 	private String officeId;    //暂弃

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

@@ -394,18 +394,6 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		workContractInfo.setPage(page);
 		List<WorkContractInfo> list = Lists.newArrayList();
 		List<WorkContractInfo> workContractInfos = workContractInfoDao.ifindList(workContractInfo);
-		/*List<WorkContractInfo> workContracts = new ArrayList<>();
-		for (WorkContractInfo contractInfo:workContractInfos){
-			WorkContractInfo workContractInfo1 = new WorkContractInfo();
-			workContractInfo1.setTotalContractId(contractInfo.getId());
-			List<WorkContractInfo> workContractInfoList = workContractInfoDao.ifindList(workContractInfo1);
-			if (workContractInfoList!=null && workContractInfoList.size()!=0){
-				workContracts.addAll(workContractInfoList);
-			}
-		}
-		workContracts.addAll(workContractInfos);
-		sortList(list,workContracts,"0",true);
-		//sortList(list,dao.findList(workContractInfo),"0",true);*/
 		page.setList(workContractInfos);
 		return page;
 	}

src/main/webapp/webpage/modules/workbidingproject/workBidingProjectForm.jsp

@@ -205,8 +205,8 @@
                 document.getElementById( "t2").style.display= "";
                 $("#ssort11").hide();$("#ssort12").hide();$("#ssort13").hide();
                 $("#ssort21").hide();$("#ssort22").hide();$("#ssort23").hide();$("#ssort24").hide();
-                $("#ssort31").hide();$("#ssort32").hide();$("#ssort33").hide();$("#ssort34").hide();$("#ssort35").hide();$("#ssort36").hide();
-                $("#ssort41").show();$("#ssort42").show();
+                $("#ssort31").hide();$("#ssort32").hide();$("#ssort33").hide();$("#ssort34").hide();
+                $("#ssort35").hide();$("#ssort36").hide();$("#ssort41").show();$("#ssort42").show();
                 $("#ssort51").hide();$("#ssort52").hide();$("#ssort53").hide();$("#ssort54").hide();$("#ssort55").hide();
                 $("#ssort101").hide();$("#ssort102").hide();
             }
@@ -214,23 +214,39 @@
                 $("#ssort ").attr("value","");
                 document.getElementById( "t1").style.display= "";
                 document.getElementById( "t2").style.display= "";
-                $("#ssort11").hide();$("#ssort12").hide();$("#ssort13").hide();
-                $("#ssort21").hide();$("#ssort22").hide();$("#ssort23").hide();$("#ssort24").hide();
-                $("#ssort31").hide();$("#ssort32").hide();$("#ssort33").hide();$("#ssort34").hide();$("#ssort35").hide();$("#ssort36").hide();
-                $("#ssort41").hide();$("#ssort42").hide();
-                $("#ssort51").show();$("#ssort52").show();$("#ssort53").show();$("#ssort54").show();$("#ssort55").show();
-                $("#ssort101").hide();$("#ssort102").hide();
+				$("#ssort11").hide();
+				$("#ssort12").hide();
+				$("#ssort13").hide();
+				$("#ssort21").hide();
+				$("#ssort22").hide();
+				$("#ssort23").hide();
+				$("#ssort24").hide();
+				$("#ssort31").hide();
+				$("#ssort32").hide();
+				$("#ssort33").hide();
+				$("#ssort34").hide();
+				$("#ssort35").hide();
+				$("#ssort36").hide();
+				$("#ssort41").hide();
+				$("#ssort42").hide();
+				$("#ssort51").show();
+				$("#ssort52").show();
+				$("#ssort53").show();
+				$("#ssort54").show();
+				$("#ssort55").show();
+				$("#ssort101").hide();
+				$("#ssort102").hide();
             }
             else if($("#psort").val()==10){
                 $("#ssort ").attr("value","");
                 document.getElementById( "t1").style.display= "";
                 document.getElementById( "t2").style.display= "";
-                $("#ssort11").hide();$("#ssort12").hide();$("#ssort13").hide();
-                $("#ssort21").hide();$("#ssort22").hide();$("#ssort23").hide();$("#ssort24").hide();
-                $("#ssort31").hide();$("#ssort32").hide();$("#ssort33").hide();$("#ssort34").hide();$("#ssort35").hide();$("#ssort36").hide();
-                $("#ssort41").hide();$("#ssort42").hide();
-                $("#ssort51").hide();$("#ssort52").hide();$("#ssort53").hide();$("#ssort54").hide();$("#ssort55").hide();
-                $("#ssort101").show();$("#ssort102").show();
+				$("#ssort11").hide();$("#ssort12").hide();$("#ssort13").hide();$("#ssort21").hide();
+				$("#ssort22").hide();$("#ssort23").hide();$("#ssort24").hide();$("#ssort31").hide();
+				$("#ssort32").hide();$("#ssort33").hide();$("#ssort34").hide();$("#ssort35").hide();
+				$("#ssort36").hide();$("#ssort41").hide();$("#ssort42").hide();$("#ssort51").hide();
+				$("#ssort52").hide();$("#ssort53").hide();$("#ssort54").hide();$("#ssort55").hide();
+				$("#ssort101").show();$("#ssort102").show();
             }else{
                 document.getElementById( "t1").style.display= "none";
                 document.getElementById( "t2").style.display= "none";