修改

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

@@ -628,7 +628,6 @@ public class ActTaskController extends BaseController {
 	@RequestMapping(value = "operator")
 	public AjaxJson operator(Act act, String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
-
 		try {
 			if (pic!=null&&pic!="") {
 				uploadImages.setPath(pic);

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -98,7 +98,7 @@
 				AND a.require_name LIKE CONCAT(CONCAT('%',#{requireName},'%'))
 			</if>
 			<if test="constructionUnitRole != null and  constructionUnitRole != ''">
-				or a.constructionUnitRole = #{constructionUnitRole}
+				AND a.construction_unit_role = #{constructionUnitRole}
 			</if>
 			<if test="earlyMaterial != null and  earlyMaterial != ''">
 				or a.earlyMaterial = #{earlyMaterial}

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -102,6 +102,7 @@ public class ProjectController extends BaseController {
 		project.setStatus("2");
 		project.setWhetherCloseStatus("0");
 		project.setEarlyMaterial(1);
+		project.setConstructionUnitRole(UserUtils.getUser().getLoginName());
 		Page<Project> page = projectService.findPage(new Page<Project>(request, response), project);
 		return getBootstrapData(page);
 	}

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

@@ -15,6 +15,8 @@ public class PickIng extends DataEntity<PickIng> {
     private String mdTheClass;
     //小类信息
     private String mdSmallClass;
+    //图片信息
+    private String mdImg;
     //单位
     private String mdUnit;
     //版本
@@ -64,4 +66,12 @@ public class PickIng extends DataEntity<PickIng> {
     public void setVersion(String version) {
         this.version = version;
     }
+
+    public String getMdImg() {
+        return mdImg;
+    }
+
+    public void setMdImg(String mdImg) {
+        this.mdImg = mdImg;
+    }
 }

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

@@ -8,9 +8,19 @@ public class PickList extends DataEntity<PickList> {
 
     //大类信息
     private String name;
+    //图片信息
+    private String mdImg;
     //中类信息
     private List<MdTheClass> mdTheClassList;
 
+    public String getMdImg() {
+        return mdImg;
+    }
+
+    public void setMdImg(String mdImg) {
+        this.mdImg = mdImg;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -4,6 +4,7 @@
 
     <sql id="classColumns">
 		a.id AS "id",
+		a.md_img AS "mdImg",
 		a.md_big_class AS "mdBigClass",
 		a.md_the_class AS "mdTheClass",
 		a.md_small_class AS "mdSmallClass",

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/PickIngService.java

@@ -5,8 +5,10 @@ package com.jeeplus.modules.sg.picking.activiti.service;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.picking.activiti.entity.*;
 import com.jeeplus.modules.sg.picking.activiti.mapper.PickIngMapper;
+import com.jeeplus.modules.sys.entity.DictValue;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
@@ -38,7 +40,8 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	 * 根据大类查询它的中类放入list并记录
 	 * */
 	public List<PickList> newAllList(PickIng entity,String s) {
-		entity.setVersion(s);
+		DictValue dic = MyActiviUtils.findDic();
+		entity.setVersion(dic.getValue());
 		//查询除所有数据
 		List<PickIng> allList = pickIngMapper.findAllList(entity);
 		//创建返回对象集合
@@ -57,6 +60,7 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 				//创建返回对象
 				PickList pickList = new PickList();
 				pickList.setName(pickIng.getMdBigClass());
+				pickList.setMdImg(pickIng.getMdImg());
 				returnList.add(pickList);
 			}
 		}
@@ -106,7 +110,6 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 				}
 			}
 		}
-
 		return returnList;
 	}
 

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

@@ -257,18 +257,17 @@ public class PickIngController extends BaseController {
                 showList.setTheNumber(String.valueOf(a));
                 DictValue dic = MyActiviUtils.findDic();
                 String value = dic.getValue();
-                System.out.println(value);
-
+                showList.setsVersion(value);
             }
-/*            //新增或编辑表单保存
+            //新增或编辑表单保存
             showListService.save(showList);//保存
             // 启动流程
             Map<String, Object> vars = Maps.newHashMap();
-            vars.put("manager", "施工经理");
+            vars.put("manager", UserUtils.getUser().getLoginName());
             ProcessDefinition p = actProcessService.getProcessDefinition(showList.getAct().getProcDefId());
             String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);*/
-            j.setMsg("发起流程审批成功!");
+            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);
+            j.setMsg("发起领料流程成功!");
             j.getBody().put("targetUrl", "/act/task/process/");
 
         }

src/main/webapp/webpage/modules/sg/picking/activiti/constructionLeaderForm.jsp

@@ -40,14 +40,6 @@
 									<sys:itemselect url="${ctx}/sg/managementcenter/project/dataPicking" id="project" name="projectId" value="${showList.projectName}" labelName="project.requireName" labelValue="${showList.projectName}"
 													title="选择项目号" cssClass="form-control " fieldLabels="${fns:urlEncode('项目需求名称|工程编号|项目名称|项目定义号')}" fieldKeys="requireName|projecId|projectName|projectNumber" searchLabels="${fns:urlEncode('项目需求名称')}" searchKeys="requireName"  isMultiSelected="false"></sys:itemselect>
 								</td>
-<%--								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>选择模块版本：</label></td>
-								<td class="width-35">
-									<form:select  cssClass="form-control" path="sVersion">
-										<c:forEach items="${showList.version}" var="list">
-											<option value="${list}">${list}</option>
-										</c:forEach>
-									</form:select>
-								</td>--%>
 							</tr>
 							<tr>
 							</tr>

src/main/webapp/webpage/modules/sg/picking/activiti/pickIng.jsp

@@ -55,7 +55,7 @@
 						<tr>
 						</c:if>
 							<td colspan="4" class="list-lig-one">${items.name}</td>
-						<c:if test="${status.count % 1 eq 0 || status.count eq 5}">
+						<c:if test="${status.count % 1 eq 0 || status.count eq 1}">
 						</tr>
 						</c:if>