驳回人员读取变更

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1104,17 +1104,16 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void economics(Act act,String design) {
+	public void economics(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
 			act.setComment("[同意] " + act.getComment());
-			vars.put("design", design);
+			vars.put("design", user.getConstructionUnitRole());
 		} else {
 			act.setComment("[驳回] " + act.getComment());
-			//查找判定设计变更的操作人
-			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判定设计变更");
-			vars.put("design", manager);
+			vars.put("design", user.getRunUnitRole());
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1349,28 +1348,22 @@ public class ActTaskService extends BaseService {
 		vars.put("jys", false);
 		vars.put("des", false);
 		vars.put("manager", false);
+		//获取流程id
+		String procInsId = act.getProcInsId();
+		Project user = MyActiviUtils.findUser(procInsId);
 		if ("yes".equals(flag)) {
-			//获取流程id
-			String procInsId = act.getProcInsId();
-			Project user = MyActiviUtils.findUser(procInsId);
 			//查询需求提出单位
 			String demandUnit = user.getDemandUnit();
 			if ("经研所".equals(demandUnit)) {
 				vars.put("design",user.getThroughResearchRole());
 				vars.put("jys", true);
 			} else {
-				vars.put("design",user.getThroughResearchRole());
+				vars.put("design", user.getDesignUnitRole());
 				vars.put("des", true);
 			}
 		} else {
 			vars.put("manager", true);
-			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
-			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理组织交底");
-			 if (manager2!=null&&manager2!="") {
-				vars.put("design",manager2);
-			}else if (manager!=null&&manager!="") {
-				 vars.put("design",manager);
-			 }
+			vars.put("design",user.getProjectManageRole());
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1408,10 +1401,11 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void designUpload(Act act,String design) {
+	public void designUpload(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		//根据登陆查询所属的角色
-		vars.put("design", design);
+		vars.put("design", user.getRunUnitRole());
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
 		// 设置意见
 		act.preUpdate();
@@ -1426,14 +1420,14 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void operatorUpload(Act act,String design) {
+	public void operatorUpload(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("design", design);
+			vars.put("design", user.getProjectManageRole());
 		} else {
-			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:重新设计");
-			vars.put("design",manager2);
+			vars.put("design", user.getDesignUnitRole());
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1450,17 +1444,15 @@ public class ActTaskService extends BaseService {
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
-	public void managerUpload(Act act,String design) {
+	public void managerUpload(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		//完成施工交底
 		if ("yes".equals(flag)) {
-			vars.put("status", 1);
-			vars.put("procInsId", act.getProcInsId());
 		} else {
-		//驳回
-			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:运行人员判断变更后材料");
-			vars.put("design", manager2);
+			//驳回
+			vars.put("design", user.getRunUnitRole());
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1647,13 +1639,7 @@ public class ActTaskService extends BaseService {
 			act.setComment("[项目关闭]"+act.getComment());
 		} else if ("reject".equals(flag)) {
 			vars.put("reject", true);
-			String manager2 = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理人工判断问题");
-			String manager = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:项目经理组织交底");
-			if (manager2!=null&&manager2!="") {
-				vars.put("policy",manager2);
-			}else if (manager!=null&&manager!="") {
-				vars.put("policy",manager);
-			}
+			vars.put("policy", user.getProjectManageRole());
 			act.setComment("[驳回]"+act.getComment());
 		}
 		// 设置意见
@@ -1672,9 +1658,9 @@ public class ActTaskService extends BaseService {
 	public void managerPolicesChange(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
-			vars.put("policy", policy);
+			vars.put("policy", user.getDistributionPolicy());
 			act.setComment("【需要政策处理】" + act.getComment());
 		} else {
 			act.setComment("【无需政策处理】" + act.getComment());
@@ -1696,12 +1682,12 @@ public class ActTaskService extends BaseService {
 	public void notSignUpload(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("policy", UserUtils.getUser().getLoginName());
+			vars.put("policy", user.getDistributionPolicy());
 			act.setComment("【未签字版清单】" + act.getComment());
 		} else {
-			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
-			vars.put("policy", policy);
+			vars.put("policy", user.getDistributionPolicy());
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1720,12 +1706,12 @@ public class ActTaskService extends BaseService {
 	public void signUploadList(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("policy", UserUtils.getUser().getLoginName());
+			vars.put("policy", user.getDistributionPolicy());
 			act.setComment("【签字版清单】" + act.getComment());
 		} else {
-			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
-			vars.put("policy", policy);
+			vars.put("policy", user.getDistributionPolicy());
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1745,12 +1731,12 @@ public class ActTaskService extends BaseService {
 	public void contractUploadList(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("policy", UserUtils.getUser().getLoginName());
+			vars.put("policy", user.getDistributionPolicy());
 			act.setComment("【签字版合同】" + act.getComment());
 		} else {
-			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
-			vars.put("policy", policy);
+			vars.put("policy", user.getDistributionPolicy());
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1769,11 +1755,11 @@ public class ActTaskService extends BaseService {
 	public void loanUploadList(Act act) {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
+		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
 			act.setComment("【完成政策处理】" + act.getComment());
 		} else {
-			String policy = MyActiviUtils.findHistoryActivity(act.getProcInsId(), "交底:判断政策处理");
-			vars.put("policy", policy);
+			vars.put("policy", user.getDistributionPolicy());
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -2361,14 +2347,19 @@ public class ActTaskService extends BaseService {
 		// 设置意见
 		act.setComment(("yes".equals(act.getFlag())?"[同意] ":"[驳回] ")+act.getComment());
 		act.preUpdate();
+		String flag = act.getFlag();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
-		vars.put("pass", "yes".equals(act.getFlag())? true : false);
+		vars.put("pass", "yes".equals(flag)? true : false);
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		String constructionUnitRole = user.getConstructionUnitRole();
-		vars.put("manager",constructionUnitRole);
+		if ("yes".equals(flag)) {
+			vars.put("design",constructionUnitRole);
+		} else {
+			vars.put("design", user.getDesignUnitRole());
+		}
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -421,12 +421,12 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "economics")
-	public AjaxJson economics(Act act,String design) {
+	public AjaxJson economics(Act act) {
 		AjaxJson j = new AjaxJson();
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.economics(act,design);
+			actTaskService.economics(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
@@ -667,7 +667,7 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "designUpload")
-	public AjaxJson designUpload(Act act, String design, String pic, String pic1,String pic2,UploadImages uploadImages) {
+	public AjaxJson designUpload(Act act, String pic, String pic1,String pic2,UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
 			if (pic!=null&&pic!="") {
@@ -693,7 +693,7 @@ public class ActTaskController extends BaseController {
 			}
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.designUpload(act,design);
+			actTaskService.designUpload(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
@@ -707,12 +707,12 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "operatorUpload")
-	public AjaxJson operatorUpload(Act act, String design) {
+	public AjaxJson operatorUpload(Act act) {
 		AjaxJson j = new AjaxJson();
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.operatorUpload(act,design);
+			actTaskService.operatorUpload(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
@@ -726,12 +726,12 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "managerUpload")
-	public AjaxJson managerUpload(Act act, String design) {
+	public AjaxJson managerUpload(Act act) {
 		AjaxJson j = new AjaxJson();
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			actTaskService.managerUpload(act,design);
+			actTaskService.managerUpload(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}

src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/ShowList.java

@@ -5,7 +5,7 @@ import com.jeeplus.core.persistence.DataEntity;
 
 import java.util.List;
 
-public class ShowList extends ActEntity<ShowList> {
+public class ShowList extends ActEntity<ShowList> implements Comparable<ShowList> {
     //物料编码
     private String materialCode;
     //物料名称;
@@ -198,4 +198,18 @@ public class ShowList extends ActEntity<ShowList> {
     public void setMdCount(Double mdCount) {
         this.mdCount = mdCount;
     }
+
+    @Override
+    public int compareTo(ShowList o) {
+        String materialCode = this.getMaterialCode();
+        String materialCode1 = o.getMaterialCode();
+        String materialDescription = this.getMaterialDescription();
+        String materialDescription1 = o.getMaterialDescription();
+
+        if (!materialDescription.equals(materialDescription1)) {
+            return materialCode.compareTo(materialCode1);
+        } else {
+            return materialDescription.compareTo(materialDescription1);
+        }
+    }
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/ShowListController.java

@@ -17,9 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "${adminPath}/picking/showlist")
@@ -124,6 +122,7 @@ public class ShowListController extends BaseController {
                     finalList.add(showList);
                 }
             }
+            Collections.sort(returnList);
             page.setList(finalList);
             return getBootstrapData(page);
         } else {
@@ -196,6 +195,7 @@ public class ShowListController extends BaseController {
                     }
                 }
             }
+            Collections.sort(returnList);
             page.setList(returnList);
             return getBootstrapData(page);
         } else {

src/main/java/com/jeeplus/modules/sys/web/FileController.java

@@ -316,7 +316,7 @@ public class FileController extends BaseController {
 		String fileUrl = Global.getAttachmentUrl2()+uploadPath+"/"+year+"/"+month+"/";
 		String fileDir = Global.getAttachmentDir2()+uploadPath+"/"+year+"/"+month+"/";
 		// 判断文件是否为空
-		if (!file.isEmpty()) {c
+		if (!file.isEmpty()) {
 			// 文件保存路径
 			// 转存文件
 			FileUtils.createDirectory(fileDir);

src/main/webapp/webpage/modules/sg/managementcenter/activiti/auditDrawings.jsp

@@ -39,7 +39,7 @@
 								"taskDefKey":"${uploadImages.act.taskDefKey}",
 								"procInsId":"${uploadImages.act.procInsId}",
 								"procDefId":"${uploadImages.act.procDefId}",
-								"flag":"yes",
+								"flag":"no",
 								"comment":window.encodeURI(message)
 							},
 							function (data) {

src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerUploadList.jsp

@@ -66,22 +66,13 @@
 		<div class="accordion-inner">
 	<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
 		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
-<%--		<input type="text" id="path" name="path" value="${uploadImages.path}">
-		 <div class="col-xs-12 col-sm-6 col-md-4">
-			<div style="margin-top:26px">
-			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
-			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
-			 </div>
-	    </div>	--%>
 	</form:form>
 	</div>
 	</div>
-	
 	<!-- 工具栏 -->
 	<div id="toolbar">
 
 		    </div>
-		
 	<!-- 表格 -->
 	<table id="testPicTable"   data-toolbar="#toolbar"></table>
 		<div class="panel-body">

src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadList.jsp

@@ -24,7 +24,6 @@
 							"procDefId":"${uploadImages.act.procDefId}",
 							"flag":"yes",
 							"pic":currentFileValues,
-							"design":design,
 							"comment":window.encodeURI(message)
 						},
 						function (data) {
@@ -74,13 +73,6 @@
 		<div class="accordion-inner">
 	<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
 		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
-<%--		<input type="text" id="path" name="path" value="${uploadImages.path}">
-		 <div class="col-xs-12 col-sm-6 col-md-4">
-			<div style="margin-top:26px">
-			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
-			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
-			 </div>
-	    </div>	--%>
 	</form:form>
 	</div>
 	</div>
@@ -100,17 +92,6 @@
 				<form:hidden path="act.taskDefKey"/>
 				<form:hidden path="act.procInsId"/>
 				<form:hidden path="act.procDefId"/>
-<%--				<table class="table table-bordered">
-					<tbody>
-					<tr>
-						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>配网项目经理：</label></td>
-						<td class="width-35">
-							<sys:userselect roleName="项目经理"  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-											cssClass="form-control required"/>
-						</td>
-					</tr>
-					</tbody>
-				</table>--%>
 				<div class="form-group">
 					<div class="col-lg-3"></div>
 					<div class="col-lg-6">