Merge remote-tracking branch 'origin/master'

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

@@ -1110,7 +1110,7 @@ public class ActTaskService extends BaseService {
 		Project user = MyActiviUtils.findUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
 			act.setComment("[同意] " + act.getComment());
-			vars.put("design", user.getConstructionUnitRole());
+			vars.put("design", user.getRunUnitRole());
 		} else {
 			act.setComment("[驳回] " + act.getComment());
 			vars.put("design", user.getRunUnitRole());
@@ -2347,11 +2347,11 @@ 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 constructionUnitRole = user.getConstructionUnitRole();
+		String designUnitRole = user.getDesignUnitRole();
 		if ("yes".equals(flag)) {
-			vars.put("design",constructionUnitRole);
+			vars.put("design",designUnitRole);
 		} else {
-			vars.put("design", user.getDesignUnitRole());
+			vars.put("design", user.getThroughResearchRole());
 		}
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}

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

@@ -426,9 +426,16 @@ public class ActTaskController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "economics")
-	public AjaxJson economics(Act act) {
+	public AjaxJson economics(Act act,String pic,UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
+			if (pic!=null&&pic!="") {
+				uploadImages.setPath(pic);
+				uploadImages.setProcInsId(act.getProcInsId());
+				uploadImages.setImgName("上传新图纸");
+				uploadImages.setuId(UserUtils.getUser().getLoginName());
+				uploadImagesService.save(uploadImages);
+			}
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.economics(act);
@@ -629,7 +636,7 @@ public class ActTaskController extends BaseController {
 	public AjaxJson operator(Act act, String pic, UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
-			if (pic!=null&&pic!="") {
+			if (pic!=null&&!"".equals(pic)) {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
 				uploadImages.setuId(UserUtils.getUser().getLoginName());

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

@@ -498,7 +498,9 @@
 	</select>
 
 	<select id="findUser"  resultType="com.jeeplus.modules.sg.managementcenter.project.entity.Project">
-		select project_manage_role
+		select
+			demand_unit
+			,project_manage_role
 			,distribution_engineering
 			,distribution_materials
 			,distribution_system

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

@@ -7,6 +7,8 @@ public class MdSmallClass extends ActEntity<MdSmallClass> {
    private String name;
    //单位
    private String mdUnit;
+   //图片信息
+   private String mdImg;
 
    public String getMdUnit() {
       return mdUnit;
@@ -23,5 +25,13 @@ public class MdSmallClass extends ActEntity<MdSmallClass> {
    public void setName(String name) {
       this.name = name;
    }
+
+   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,19 +8,9 @@ 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/service/PickIngService.java

@@ -3,8 +3,10 @@
  */
 package com.jeeplus.modules.sg.picking.activiti.service;
 
+import com.jeeplus.common.config.Global;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 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;
@@ -14,6 +16,8 @@ import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+import java.security.cert.LDAPCertStoreParameters;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,6 +31,9 @@ import java.util.List;
 public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	@Autowired
 	private PickIngMapper pickIngMapper;
+	@Autowired
+	private HttpServletRequest request;
+
 
 	@Override
 	public Page<PickIng> findPage(Page<PickIng> page, PickIng entity) {
@@ -39,7 +46,7 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	 * 去除重复，记录大类
 	 * 根据大类查询它的中类放入list并记录
 	 * */
-	public List<PickList> newAllList(PickIng entity,String s) {
+	public List<PickList> newAllList(PickIng entity, String s) {
 		DictValue dic = MyActiviUtils.findDic();
 		entity.setVersion(dic.getValue());
 		//查询除所有数据
@@ -60,7 +67,6 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 				//创建返回对象
 				PickList pickList = new PickList();
 				pickList.setName(pickIng.getMdBigClass());
-				pickList.setMdImg(pickIng.getMdImg());
 				returnList.add(pickList);
 			}
 		}
@@ -104,6 +110,11 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 						mdSmallClass.setName(pc.getMdSmallClass());
 						mdSmallClass.setId(pc.getId());
 						mdSmallClass.setMdUnit(pc.getMdUnit());
+						if (Global.SYS_TYPE.equals("2")) {
+							mdSmallClass.setMdImg("http://" + request.getServerName() + pc.getMdImg());
+						} else {
+							mdSmallClass.setMdImg(pc.getMdImg());
+						}
 						mdSmallClassList.add(mdSmallClass);
 					}
 					md.setMdSmallClassList(mdSmallClassList);

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

@@ -132,7 +132,7 @@ public class PickIngController extends BaseController {
     }
 
 
-    //    manager
+/*    //    manager
     @ResponseBody
     @RequestMapping(value = "constructionData")
     public Map<String, Object> constructionData(ShowList showList, String procInsId, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -220,7 +220,7 @@ public class PickIngController extends BaseController {
             Page<ShowList> page = showListService.findPage(new Page<ShowList>(request, response), showList);
             return getBootstrapData(page);
         }
-    }
+    }*/
 
     /**
      * 领料流程发起

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

@@ -63,6 +63,7 @@
 						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
 					</h3>
 				</div>
+				<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
 				<table id="testPicTable"   data-toolbar="#toolbar"></table>
 				<div class="panel-body">
 					<div class="row">
@@ -70,7 +71,7 @@
 						<div class="col-sm-6">
 							<div class="form-group text-center">
 								<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="审核" />&nbsp;
-								<input id="no" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="驳回" />&nbsp;
+								<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="驳回" />&nbsp;
 							</div>
 						</div>
 					</div>

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

@@ -10,24 +10,30 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
+				var currentFileValues = $("input[name='pic']").val();
+				if (currentFileValues == "") {
+					jp.error("请选择上传的文件");
+				} else {
 					jp.prompt("审核", function (message) {
 						jp.post("${ctx}/act/task/economics",
-						{
-							"taskId":"${construction.act.taskId}",
-							"taskName":"${construction.act.taskName}",
-							"taskDefKey":"${construction.act.taskDefKey}",
-							"procInsId":"${construction.act.procInsId}",
-							"procDefId":"${construction.act.procDefId}",
-							"flag":"yes",
-							"comment":window.encodeURI(message)
-						},
-						function (data) {
-							if(data.success){
-								jp.success(data.msg);
-								jp.go("${ctx}/act/task/todo")
-							}
-						})
+								{
+									"taskId":"${construction.act.taskId}",
+									"taskName":"${construction.act.taskName}",
+									"taskDefKey":"${construction.act.taskDefKey}",
+									"procInsId":"${construction.act.procInsId}",
+									"procDefId":"${construction.act.procDefId}",
+									"pic":currentFileValues,
+									"flag":"yes",
+									"comment":window.encodeURI(message)
+								},
+								function (data) {
+									if(data.success){
+										jp.success(data.msg);
+										jp.go("${ctx}/act/task/todo")
+									}
+								})
 					});
+				}
 			});
 			$("#no").click(function () {
 				jp.prompt("驳回", function (message) {
@@ -88,29 +94,11 @@
 								<td class="width-35">
 									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 								</td>
-								<td class="width-15 active"><label class="pull-right">选择用户：</label></td>
-								<td class="width-35">
-									<sys:userselect  id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
-												roleName="设计单位人员"	cssClass="form-control required"/>
-<%--									<select id="design"  class=" form-control">
-										<option>经研所</option>
-										<option>设计单位人员</option>
-									</select>--%>
-								</td>
-							</tr>
-				<%--			<tr>
-								<td class="width-15 active"><label class="pull-right">是否方案变更：</label></td>
-								<td class="width-35">
-									<select id="fabg"  class=" form-control">
-										<option>是</option>
-										<option>否</option>
-									</select>
-								</td>
-								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
-								<td class="width-35">
+								<td id="demandUnit1" class="width-15 active"><label class="pull-right">上传新方案图纸：</label></td>
+								<td id="demandUnit2" class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
-							</tr>--%>
+							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
 								<td class="width-35">

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

@@ -9,34 +9,40 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			var demandUnit = $("#demandUnit").val();
+			var flag = false;
 			if (demandUnit=="经研所") {
 				$("#demandUnit1").css("display", "none");
 				$("#demandUnit2").css("display", "none");
+				flag = true;
 			}
 			$("#agree").click(function () {
-				var pic = $("#pic").val();
-				jp.prompt("审核意见", function (message) {
-					jp.post("${ctx}/act/task/operator",
-					{
-						"taskId":"${construction.act.taskId}",
-						"taskName":"${construction.act.taskName}",
-						"taskDefKey":"${construction.act.taskDefKey}",
-						"procInsId":"${construction.act.procInsId}",
-						"procDefId":"${construction.act.procDefId}",
-						"flag":"yes",
-						"pic":pic,
-						"projectName":"${fns:unescapeHtml(construction.projectName)}",
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}else {
-							jp.error("请选择与需求提出单位对应的人员")
-						}
-					})
-				});
+				var currentFileValues = $("input[name='pic']").val();
+				if (flag==false&&currentFileValues=="") {
+					jp.error("请选择上传文件")
+				}else {
+					jp.prompt("审核意见", function (message) {
+						jp.post("${ctx}/act/task/operator",
+								{
+									"taskId":"${construction.act.taskId}",
+									"taskName":"${construction.act.taskName}",
+									"taskDefKey":"${construction.act.taskDefKey}",
+									"procInsId":"${construction.act.procInsId}",
+									"procDefId":"${construction.act.procDefId}",
+									"flag":"yes",
+									"pic":currentFileValues,
+									"projectName":"${fns:unescapeHtml(construction.projectName)}",
+									"comment":window.encodeURI(message)
+								},
+								function (data) {
+									if(data.success){
+										jp.success(data.msg);
+										jp.go("${ctx}/act/task/todo")
+									}else {
+										jp.error("请选择与需求提出单位对应的人员")
+									}
+								})
+					});
+				}
 			});
 			$("#no").click(function () {
 				// alert(design);

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

@@ -64,7 +64,7 @@
 								<tr>
 							</c:if>
 							<td colspan="4" class="list-lig-two">${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>
 
@@ -80,6 +80,10 @@
 										</div>
 										<div style="float: left;margin-left: 5px;margin: auto">
 											<input style="width:40px;" placeholder="0" type="number" min="0" name="need" id="${itemss.id}"/><span>&nbsp;${itemss.mdUnit}</span>
+<%--											<span><img onclick="jp.showPic('${itemss.mdImg}')" src="${itemss.mdImg}" height="50px"></span>--%>
+											<c:if test="${not empty itemss.mdImg}">
+												<a id="imgButton" class="btn btn-success btn-xs waves-effect m-r-5" href="javascript:jp.showPic('${itemss.mdImg}')">显示图片</a>
+											</c:if>
 										</div>
 								</td>
 								<c:if test="${status.count % 4 eq 0 || status.count eq 4}">

src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp

@@ -48,7 +48,7 @@
 			<ul id="o1" class="nav navbar-toolbar nav-tabs  navbar-left" style="width: calc( 100% - 680px)" role="tablist">
 			<t:jpMenu  menu="${fns:getTopMenu()}" position="top"></t:jpMenu>
 		</ul>
-		<ul class="nav navbar-nav pull-right navbar-right">
+		<ul class="nav navbar-nav pull-right navbar-right" style="margin: 0px">
 				<li>
 					<a href="${ctx}/home"  class="J_menuItem"><i class="fa fa-home" style="font-size:14px;"></i></a>
 				</li>