Merge remote-tracking branch 'origin/master'

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

@@ -1246,10 +1246,10 @@ public class ActTaskService extends BaseService {
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
 			act.setComment("[同意] " + act.getComment());
-			vars.put("design", user.getRunUnitRole());
+			vars.put("design", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 		} else {
 			act.setComment("[驳回] " + act.getComment());
-			vars.put("design", user.getRunUnitRole());
+			vars.put("design", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1276,7 +1276,7 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
-		vars.put("processer",user.getProjectManageRole());
+		vars.put("processer", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -1339,23 +1339,23 @@ public class ActTaskService extends BaseService {
 			Project user = MyActiviUtils.findUser(act.getProcInsId());
 			if (pass1 == true) {
 				vars.put("pass1", true);
-				vars.put("design", user.getRunUnitRole());
+				vars.put("design", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 			}
 			if (pass2 == true) {
 				vars.put("pass2", true);
-				vars.put("itemClose", user.getDistributionEngineering());
+				vars.put("itemClose",UserUtils.getByUserName( user.getDistributionEngineering() ).getLoginName());
 			}
 			if (pass3 == true) {
 				vars.put("pass3", true);
-				vars.put("coveredPerson", user.getConstructionUnitRole());
+				vars.put("coveredPerson", UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName());
 			}
 			if (pass5 == true) {
 				vars.put("pass5", true);
-				vars.put("policy", user.getDistributionPolicy());
+				vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			}
 			if (pass6 == true) {
 				vars.put("countryside", true);
-				vars.put("policy", user.getDistributionPolicy());
+				vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			}
 			vars.put("problem", true);
 			act.setComment("[存在问题]" + act.getComment());
@@ -1420,27 +1420,27 @@ public class ActTaskService extends BaseService {
 			if (pass1) {
 				vars.put("pass1", true);
 				Project user = MyActiviUtils.findUser(act.getProcInsId());
-				vars.put("design", user.getRunUnitRole());
+				vars.put("design",UserUtils.getByUserName(user.getRunUnitRole()).getLoginName() );
 			}
 			if (pass2) {
 				vars.put("pass2", true);
 				Project user = MyActiviUtils.findUser(act.getProcInsId());
-				vars.put("itemClose", user.getDistributionEngineering());//配网工程专职角色
+				vars.put("itemClose", UserUtils.getByUserName(user.getDistributionEngineering()).getLoginName());//配网工程专职角色
 			}
 			if (pass3) {
 				vars.put("pass3", true);
 				Project user = MyActiviUtils.findUser(act.getProcInsId());
-				vars.put("coveredPerson", user.getConstructionUnitRole());//施工单位角色
+				vars.put("coveredPerson", UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName());//施工单位角色
 			}
 			if (pass5) {
 				vars.put("pass5", true);
 				Project user = MyActiviUtils.findUser(act.getProcInsId());
-				vars.put("policy", user.getDistributionPolicy());//配网政策处理专职角色
+				vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());//配网政策处理专职角色
 			}
 			if (countryside){
 				vars.put("countryside", true);
 				Project user = MyActiviUtils.findUser(act.getProcInsId());
-				vars.put("policy", user.getDistributionPolicy());//配网政策处理专职角色
+				vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());//配网政策处理专职角色
 			}
 		}
 		act.preUpdate();
@@ -1524,28 +1524,28 @@ public class ActTaskService extends BaseService {
 			 if (close) {
 				//项目关闭
 				vars.put("pass2", true);
-				vars.put("itemClose", user.getDistributionEngineering());
+				vars.put("itemClose", UserUtils.getByUserName(user.getDistributionEngineering()).getLoginName());
 			}else  {
 				act.setComment("[存在问题]" + act.getComment());
 				if (design) {
 					//设计变更
 					vars.put("pass1", true);
-					vars.put("design", user.getRunUnitRole());
+					vars.put("design", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 				}
 				if (pass3) {
 					//政策处理（城区道路）
 					vars.put("pass3", true);
-					vars.put("coveredPerson", user.getConstructionUnitRole());
+					vars.put("coveredPerson", UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName());
 				}
 				if (pass5) {
 					//农村
 					vars.put("pass5", true);
-					vars.put("policy", user.getDistributionPolicy());
+					vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 				}
 				if (pass6){
 					//民事政处/行政政处
 					vars.put("countryside", true);
-					vars.put("policy", user.getDistributionPolicy());
+					vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 				}
 			}
 			act.preUpdate();
@@ -1574,15 +1574,15 @@ public class ActTaskService extends BaseService {
 			//查询需求提出单位
 			String demandUnit = user.getDemandUnit();
 			if ("经研所".equals(demandUnit)) {
-				vars.put("design",user.getThroughResearchRole());
+				vars.put("design", UserUtils.getByUserName(user.getThroughResearchRole()).getLoginName());
 				vars.put("jys", true);
 			} else {
-				vars.put("design", user.getDesignUnitManage());
+				vars.put("design", UserUtils.getByUserName(user.getDesignUnitManage()).getLoginName());
 				vars.put("des", true);
 			}
 		} else {
 			vars.put("manager", true);
-			vars.put("design",user.getProjectManageRole());
+			vars.put("design", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 		}
 		// 设置意见
 		act.preUpdate();
@@ -1602,7 +1602,7 @@ public class ActTaskService extends BaseService {
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		String flag = act.getFlag();
 		if ("yes".equals(flag)) {
-			vars.put("design", user.getRunUnitRole());
+			vars.put("design", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 		} else {
 
 		}
@@ -1624,7 +1624,7 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		//根据登陆查询所属的角色
-		vars.put("design", user.getRunUnitRole());
+		vars.put("design", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
 		// 设置意见
 		act.preUpdate();
@@ -1644,9 +1644,9 @@ public class ActTaskService extends BaseService {
 		String flag = act.getFlag();
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("design", user.getProjectManageRole());
+			vars.put("design", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 		} else {
-			vars.put("design", user.getDesignUnitManage());
+			vars.put("design", UserUtils.getByUserName(user.getDesignUnitManage()).getLoginName());
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1669,10 +1669,10 @@ public class ActTaskService extends BaseService {
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		//发给施工单位人员审核
 		if ("yes".equals(flag)) {
-			vars.put("design", user.getConstructionUnitRole());
+			vars.put("design", UserUtils.getByUserName(user.getConstructionUnitRole()).getLoginName());
 		} else {
 			//驳回
-			vars.put("design", user.getRunUnitRole());
+			vars.put("design", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1697,7 +1697,7 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 		} else {
 			//驳回
-			vars.put("design", user.getProjectManageRole());
+			vars.put("design", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 		}
 		//根据登陆查询所属的角色
 		vars.put("pass", "yes".equals(flag)? true : false);
@@ -1876,15 +1876,15 @@ public class ActTaskService extends BaseService {
 			act.setComment("[通过]"+act.getComment());
 		} else if ("pass1".equals(flag)) {
 			vars.put("pass1", true);
-			vars.put("design", user.getRunUnitRole());
+			vars.put("design", UserUtils.getByUserName(user.getRunUnitRole()).getLoginName());
 			act.setComment("[设计变更]"+act.getComment());
 		} else if ("pass2".equals(flag)) {
 			vars.put("pass2", true);
-			vars.put("itemClose", user.getDistributionEngineering());
+			vars.put("itemClose", UserUtils.getByUserName(user.getDistributionEngineering()).getLoginName());
 			act.setComment("[项目关闭]"+act.getComment());
 		} else if ("reject".equals(flag)) {
 			vars.put("reject", true);
-			vars.put("policy", user.getProjectManageRole());
+			vars.put("policy", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 			act.setComment("[驳回]"+act.getComment());
 		}
 		// 设置意见
@@ -1905,7 +1905,7 @@ public class ActTaskService extends BaseService {
 		String flag = act.getFlag();
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("policy", user.getDistributionPolicy());
+			vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("【需要政策处理】" + act.getComment());
 		} else {
 			act.setComment("【无需政策处理】" + act.getComment());
@@ -1929,10 +1929,10 @@ public class ActTaskService extends BaseService {
 		String flag = act.getFlag();
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("policy", user.getDistributionPolicy());
+			vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("【未签字版清单】" + act.getComment());
 		} else {
-			vars.put("policy", user.getDistributionPolicy());
+			vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1953,10 +1953,10 @@ public class ActTaskService extends BaseService {
 		String flag = act.getFlag();
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("policy", user.getDistributionPolicy());
+			vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("【签字版清单】" + act.getComment());
 		} else {
-			vars.put("policy", user.getDistributionPolicy());
+			vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -1978,10 +1978,10 @@ public class ActTaskService extends BaseService {
 		String flag = act.getFlag();
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
-			vars.put("policy", user.getDistributionPolicy());
+			vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("【签字版合同】" + act.getComment());
 		} else {
-			vars.put("policy", user.getDistributionPolicy());
+			vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -2004,7 +2004,7 @@ public class ActTaskService extends BaseService {
 		if ("yes".equals(flag)) {
 			act.setComment("【完成政策处理】" + act.getComment());
 		} else {
-			vars.put("policy", user.getDistributionPolicy());
+			vars.put("policy", UserUtils.getByUserName(user.getDistributionPolicy()).getLoginName());
 			act.setComment("【驳回】" + act.getComment());
 		}
 		act.preUpdate();
@@ -2697,11 +2697,10 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(flag)? true : false);
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
-		String designUnitRole = user.getDesignUnitManage();
 		if ("yes".equals(flag)) {
-			vars.put("design",designUnitRole);
+			vars.put("design", UserUtils.getByUserName(user.getDesignUnitManage()).getLoginName());
 		} else {
-			vars.put("design", user.getThroughResearchRole());
+			vars.put("design", UserUtils.getByUserName(user.getThroughResearchRole()).getLoginName());
 		}
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -167,23 +167,6 @@
 	from md_process_list where procInsId = #{procInsId}
 	</select>
 
-	<select id="findNewTemList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
-	SELECT
-		id,
-		procInsId,
-		materialCode,
-		extensionDescription,
-		materialDescription,
-		mdUnits,
-		mdTotalAmount,
-		mdTotalAmountAfter,
-		mdSingleWeight,
-		mdTotalWeight,
-		mdTheParty,
-		mdText
-	from md_temporary_list where procInsId = #{procInsId}
-	</select>
-
 	<select id="inventoryComparisonData" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
 	SELECT
 		id,
@@ -222,22 +205,6 @@
 	</select>
 
 
-	<select id="findOneTemList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
-	SELECT
-		id,
-		procInsId,
-		materialCode,
-		extensionDescription,
-		materialDescription,
-		mdUnits,
-		mdTotalAmount,
-		mdSingleWeight,
-		mdTotalWeight,
-		mdTheParty,
-		mdText
-	from md_temporary_list where id = #{id}
-	</select>
-
 	<select id="itemQuery" resultType="string">
 		select select_number from md_acquisition_process where proc_ins_id = #{procInsId}
 	</select>
@@ -249,21 +216,10 @@
 		where id = #{id};
 	</update>
 
-	<update id="updateTemAmount">
-		update md_temporary_list
-		set mdTotalAmount = #{mdTotalAmount},
-			mdTotalWeight=#{mdTotalWeight}
-		where id = #{id};
-	</update>
-
 	<delete id="deleteData">
 		delete from md_process_list where id=#{id};
 	</delete>
 
-	<delete id="deleteTemData">
-		delete from md_temporary_list where id=#{id};
-	</delete>
-
 	<select id="inventoryQuery" resultType="com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory">
 		select materialCode,availableStockQuantity,materialDetail from xm_material_inventory
 		where materialCode in