Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/config/Global.java

@@ -109,7 +109,7 @@ public class Global {
 	 */
 	public static String getAttachmentDir(){
 		SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) UserUtils.getPrincipal();
-		String dir = Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL + principal + "/程序附件/";
+		String dir = Global.getUserfilesBaseDir()  ;
 		FileUtils.createDirectory(dir);
 		return dir;
 	}
@@ -121,7 +121,7 @@ public class Global {
 	public static String getAttachmentUrl(){
 
 		SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) UserUtils.getPrincipal();
-		return  Servlets.getRequest().getContextPath() + Global.USERFILES_BASE_URL + principal + "/程序附件/";
+		return  Servlets.getRequest().getContextPath() ;
 	}
 
 	/**

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

@@ -23,6 +23,9 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.core.persistence.ActEntity;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.utils.ProcessDefCache;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.PersonnelManagementService;
+import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.editor.constants.ModelDataJsonConstants;
@@ -67,6 +70,8 @@ public class ActProcessService extends BaseService {
 	private HistoryService historyService;
 	@Autowired
 	private ActTaskService actTaskService;
+	@Autowired
+	private PersonnelManagementService personnelManagementService;
 
 	/**
 	 * 流程定义列表
@@ -88,22 +93,43 @@ public class ActProcessService extends BaseService {
 		}else {
 			processDefinitionList = processDefinitionQuery.listPage(page.getFirstResult(), page.getMaxResults());
 		}
-	    for (ProcessDefinition processDefinition : processDefinitionList) {
+
+		String id = UserUtils.getUser().getId();
+		PersonnelManagement personnelManagement = new PersonnelManagement();
+		personnelManagement = personnelManagementService.get(id);
+		String[] strarr = null;
+		if (personnelManagement != null) {
+			String pid = personnelManagement.getPid();
+			strarr = pid.split(";");
+		}
+
+
+		for (ProcessDefinition processDefinition : processDefinitionList) {
 	      String deploymentId = processDefinition.getDeploymentId();
 	      Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentId).singleResult();
-	      Map pMap = new HashMap<>();
-	      pMap.put("id", processDefinition.getId());
-	      pMap.put("category", processDefinition.getCategory());
-	      pMap.put("key", processDefinition.getKey());
-	      pMap.put("name", processDefinition.getName());
-	      pMap.put("version","V:"+processDefinition.getVersion());
-	      pMap.put("resourceName", processDefinition.getResourceName());
-	      pMap.put("description", processDefinition.getDescription());
-	      pMap.put("diagramResourceName", processDefinition.getDiagramResourceName());
-	      pMap.put("deploymentId", processDefinition.getDeploymentId());
-	      pMap.put("suspended", processDefinition.isSuspended());
-			pMap.put("deploymentTime",deployment.getDeploymentTime());
-	      page.getList().add(pMap);
+			Map pMap = new HashMap<>();
+			String id1 = processDefinition.getId();
+			if (strarr != null) {
+				for (String str : strarr) {
+					if (str.equals(id1)) {
+						pMap.put("id", processDefinition.getId());
+						pMap.put("category", processDefinition.getCategory());
+						pMap.put("key", processDefinition.getKey());
+						pMap.put("name", processDefinition.getName());
+						pMap.put("version","V:"+processDefinition.getVersion());
+						pMap.put("resourceName", processDefinition.getResourceName());
+						pMap.put("description", processDefinition.getDescription());
+						pMap.put("diagramResourceName", processDefinition.getDiagramResourceName());
+						pMap.put("deploymentId", processDefinition.getDeploymentId());
+						pMap.put("suspended", processDefinition.isSuspended());
+						pMap.put("deploymentTime",deployment.getDeploymentTime());
+						page.getList().add(pMap);
+						continue;
+					} else {
+						continue;
+					}
+				}
+			}
 	    }
 
 		return page;

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

@@ -173,7 +173,11 @@ public class ActTaskController extends BaseController {
 		// 获取流程实例对象
 		if (act.getProcInsId() != null){
 			if(actTaskService.getProcIns(act.getProcInsId())!=null){
-				act.setProcIns(actTaskService.getProcIns(act.getProcInsId()));
+				try {
+					act.setProcIns(actTaskService.getProcIns(act.getProcInsId()));
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}else{
 				act.setFinishedProcIns(actTaskService.getFinishedProcIns(act.getProcInsId()));
 			}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/PersonnelManagement.java

@@ -0,0 +1,24 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+
+public class PersonnelManagement extends ActEntity<PersonnelManagement> {
+    private String uId;
+    private String Pid;
+
+    public String getuId() {
+        return uId;
+    }
+
+    public void setuId(String uId) {
+        this.uId = uId;
+    }
+
+    public String getPid() {
+        return Pid;
+    }
+
+    public void setPid(String pid) {
+        Pid = pid;
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/UploadImages.java

@@ -0,0 +1,44 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.entity;
+
+import com.jeeplus.core.persistence.ActEntity;
+
+public class UploadImages extends ActEntity<UploadImages> {
+    private String imgName;
+    private String path;
+    private String procInsId;
+    private String uId;
+
+    public String getImgName() {
+        return imgName;
+    }
+
+    public void setImgName(String imgName) {
+        this.imgName = imgName;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    @Override
+    public String getProcInsId() {
+        return procInsId;
+    }
+
+    @Override
+    public void setProcInsId(String procInsId) {
+        this.procInsId = procInsId;
+    }
+
+    public String getuId() {
+        return uId;
+    }
+
+    public void setuId(String uId) {
+        this.uId = uId;
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/PersonnelManagementMapper.java

@@ -0,0 +1,20 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement;
+
+/**
+ * 施工交底MAPPER接口
+ * @author
+ * @version 2019-11-08
+ */
+
+@MyBatisMapper
+public interface PersonnelManagementMapper extends BaseMapper<PersonnelManagement> {
+
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/UploadImagesMapper.java

@@ -0,0 +1,19 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
+
+/**
+ * 施工交底MAPPER接口
+ * @author
+ * @version 2019-11-08
+ */
+
+@MyBatisMapper
+public interface UploadImagesMapper extends BaseMapper<UploadImages> {
+    
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/PersonnelManagementMapper.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.activiti.mapper.PersonnelManagementMapper">
+    
+	<sql id="constructionColumns">
+		a.id AS "id",
+		a.uId AS "uid",
+		a.Pid AS "pid",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+
+	</sql>
+
+	<select id="get" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement" >
+		SELECT *
+		FROM xm_personnel_management a
+		WHERE a.uId = #{uId}
+	</select>
+	
+	<select id="findList" resultType="PersonnelManagement" >
+		SELECT *
+		FROM xm_personnel_management a
+		<where>
+			<if test="dataScope != null and dataScope != ''">
+				${dataScope}
+			</if>
+			<if test="uId != null and uId != ''">
+				AND a.uId = #{uId}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="PersonnelManagement" >
+		SELECT *
+		FROM xm_personnel_management a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO xm_personnel_management(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE xm_personnel_management SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks}
+		WHERE id = #{id}
+	</update>
+
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM xm_personnel_management
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE xm_personnel_management SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+
+	
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/UploadImagesMapper.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.activiti.mapper.UploadImagesMapper">
+    
+	<sql id="constructionColumns">
+		a.id AS "id",
+		a.uId AS "uid",
+		a.imgName AS "imgName",
+		a.path AS "path",
+		a.proc_ins_id AS "procInsId",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+
+	</sql>
+
+	<select id="get" resultType="com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages" >
+		SELECT *
+		FROM xm_upolad_images a
+		WHERE a.uId = #{uId}
+	</select>
+	
+	<select id="findList" resultType="UploadImages" >
+		SELECT *
+		FROM xm_upolad_images a
+		<where>
+			<if test="dataScope != null and dataScope != ''">
+				${dataScope}
+			</if>
+			<if test="uId != null and uId != ''">
+				AND a.uId = #{uId}
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="UploadImages" >
+		SELECT *
+		FROM xm_upolad_images a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO xm_upolad_images(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			imgName,
+			path,
+			proc_ins_id,
+			uId
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{imgName},
+			#{path},
+			#{procInsId},
+			#{uId}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE xm_upolad_images SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks}
+		WHERE id = #{id}
+	</update>
+
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM xm_upolad_images
+		WHERE id = #{id}
+	</update>
+	
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE xm_upolad_images SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+
+	
+</mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/PersonnelManagementService.java

@@ -0,0 +1,49 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.DiscloseMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.PersonnelManagementMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 施工交底Service
+ * @author
+ * @version 2019-11-08
+ */
+@Service
+@Transactional(readOnly = true)
+public class PersonnelManagementService extends CrudService<PersonnelManagementMapper,PersonnelManagement> {
+
+	@Autowired
+	private PersonnelManagementMapper personnelManagementMapper;
+
+	@Override
+	public PersonnelManagement get(String id) {
+		return super.get(id);
+	}
+
+	@Override
+	public List<PersonnelManagement> findList(PersonnelManagement entity) {
+		return super.findList(entity);
+	}
+
+	@Override
+	public void save(PersonnelManagement entity) {
+		super.save(entity);
+	}
+
+	@Override
+	public void delete(PersonnelManagement entity) {
+		super.delete(entity);
+	}
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/UploadImagesService.java

@@ -0,0 +1,51 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.managementcenter.activiti.service;
+
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.PersonnelManagementMapper;
+import com.jeeplus.modules.sg.managementcenter.activiti.mapper.UploadImagesMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 图片Service
+ * @author
+ * @version 2019-11-08
+ */
+@Service
+@Transactional(readOnly = true)
+public class UploadImagesService extends CrudService<UploadImagesMapper, UploadImages> {
+
+	@Override
+	public UploadImages get(String id) {
+		return super.get(id);
+	}
+
+	@Override
+	public List<UploadImages> findList(UploadImages entity) {
+		return super.findList(entity);
+	}
+
+	@Override
+	public List<UploadImages> findListBy(List<UploadImages> entity) {
+		return super.findListBy(entity);
+	}
+
+	@Override
+	public List<UploadImages> findAllList(UploadImages entity) {
+		return super.findAllList(entity);
+	}
+
+	@Override
+	@Transactional(readOnly = false)
+	public void save(UploadImages entity) {
+		super.save(entity);
+	}
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/DivideController.java

@@ -7,19 +7,27 @@ import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Construction;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.Disclose;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.UploadImagesService;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.test.pic.entity.TestPic;
 import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -40,7 +48,9 @@ public class DivideController extends BaseController {
 	private ActTaskService actTaskService;
 	@Autowired
 	private DiscloseService discloseService;
-	
+	@Autowired
+	private UploadImagesService uploadImagesService;
+
 	@ModelAttribute
 	public Construction get(@RequestParam(required=false) String id) {
 		Construction entity = null;
@@ -53,6 +63,34 @@ public class DivideController extends BaseController {
 		return entity;
 	}
 
+	@RequestMapping(value = "upload")
+	public String formUp(Construction construction, Model model) {
+		model.addAttribute("construction", construction);
+		return "modules/sg/managementcenter/activiti/upload";
+	}
+
+
+
+	/**
+	 * 图片管理列表页面
+	 */
+	@RequestMapping(value = {"images"})
+	public String list(Construction construction, Model model) {
+		model.addAttribute("construction", construction);
+		return "modules/sg/managementcenter/activiti/uploadList";
+	}
+
+
+	/**
+	 * 文件管理列表数据
+	 */
+	@ResponseBody
+	@RequestMapping(value = "data")
+	public Map<String, Object> data(UploadImages uploadImages, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<UploadImages> page = uploadImagesService.findPage(new Page<UploadImages>(request, response), uploadImages);
+		return getBootstrapData(page);
+	}
+
 
 	
 
@@ -114,6 +152,41 @@ public class DivideController extends BaseController {
 
 		return j;
 	}
+
+	@ResponseBody
+	@RequestMapping(value = "uploadSave")
+	public AjaxJson uploadSave(Disclose disclose, Model model,String pic) throws Exception{
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(disclose);
+		if (StringUtils.isNotBlank(errMsg)){
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+
+		/**
+		 * 流程审批
+		 */
+		if (StringUtils.isBlank(disclose.getId())){
+			UploadImages uploadImages = new UploadImages();
+			uploadImages.setPath(pic);
+			uploadImages.setProcInsId(disclose.getAct().getProcDefId());
+			uploadImages.setuId(UserUtils.getUser().getLoginName());
+			uploadImagesService.save(uploadImages);
+			//新增或编辑表单保存
+			// 启动流程
+			ProcessDefinition p = actProcessService.getProcessDefinition(disclose.getAct().getProcDefId());
+			String title = disclose.getCurrentUser().getName()+"在"+ DateUtils.getDateTime()+"发起"+p.getName();
+			actTaskService.startProcess(p.getKey(),  "xm_construction_clarificaiton", disclose.getId(), title);
+			j.setMsg("提交审批成功!");
+			j.getBody().put("targetUrl",  "/act/task/process/");
+		}
+
+		return j;
+	}
 	
 
 

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.jsp

@@ -15,7 +15,7 @@
 	<div class="panel-heading">
 		<h3 class="panel-title">待办任务列表</h3>
 	</div>
-	<div class="panel-body">q
+	<div class="panel-body">
 	
 	<!-- 搜索 -->
 	<div id="search-collapse" class="collapse">

src/main/webapp/webpage/modules/common/fileUpload.jsp

@@ -17,7 +17,7 @@
 				<c:if test="${ readonly == false }">
 				<a class="fa fa-minus-circle remove-this fa-2x file-item pull-right fa-danger" data-id="{{d.file.id}}"></a>
 				</c:if>
-				<a class="fa fa-cloud-download download-this fa-2x file-item pull-right text-info {{d.file.hide}}" data-url="{{d.file.url}}"></a>
+				<a style="display: none" class="fa fa-cloud-download download-this fa-2x file-item pull-right text-info {{d.file.hide}}" data-url="{{d.file.url}}"></a>
 			</div>
 		</div>
 	</script>

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

@@ -227,6 +227,7 @@
 								<td class="width-35">
 									<sys:userselect id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
+<%--									<sys:fileUpload path="pic" fileNumLimit="2" fileSizeLimit="50" value="${testPic.pic}" type="image" uploadPath="/test/pic/testPic"></sys:fileUpload>--%>
 								</td>
 							</tr>
 							<tr>

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

@@ -0,0 +1,83 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<link rel="stylesheet" href="${ctxp}/static/plugin/assets/layui/css/layui.css">
+<link rel="stylesheet" href="${ctxp}/static/plugin/assets/common.css"/>
+<link rel="stylesheet" href="${ctxp}/static/plugin/assets/vermeit.css">
+<script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
+<script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
+<%@ include file="addItem2Form.js"%>
+<html>
+<head>
+    <title>添加工程</title>
+    <meta http-equiv=Content-Type content=“text/html;charset=utf-8″>
+    <meta http-equiv=X-UA-Compatible content=IE=EmulateIE7>
+    <meta name="renderer" content="webkit">
+    <style>
+        .layui-input{ height: 28px;margin-top: 6px;line-height: 28px}
+        .layui-table-view .layui-table {width:100%}
+        .myselect{border: none;padding: 5px 7px;min-height: 20px;color: #666666;line-height: 20px}
+        .mydiv{padding: 5px 7px;min-height: 20px;border: whitesmoke;line-height: 20px}
+        .mydiv:empty:before{content: attr(placeholder);color:#999999;}
+        .mydiv:focus:before{content:none}
+        .layui-table-tips-main{display:none}
+        .layui-table-tips-c{display:none}
+    </style>
+</head>
+<body style="height: 100%;line-height: 100%">
+<div style="padding: 10px; background-color: #F2F2F2;">
+    <div class="layui-main-bgc">
+        <%--<sys:message content="${message}"/>--%>
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <div class="layui-card-header layui-card-header-add">单体工程管理</div>
+                        <div class="layui-card-body" style="margin-top: 2px;">
+                            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+                                <legend style="font-size: 15px;">添加单体工程</legend>
+                            </fieldset>
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 100px;">*单体工程名称</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="myinput" autocomplete="off" placeholder="" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 100px">*单体工程编号</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="dt_number" value="" autocomplete="off" placeholder="" class="layui-input">
+                                    </div>
+                                </div>
+                            </div>
+                            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+                                <legend style="font-size: 15px;">添加结算书</legend>
+                            </fieldset>
+                            <div class="layui-upload">
+                                <button type="button" class="layui-btn layui-btn-normal" id="add_List">添加结算书</button>
+                                <div class="layui-upload-list">
+                                        <table class="layui-table" id="mytable">
+                                        <thead>
+                                        <tr>
+                                            <th width="45%">*结算书名称</th>
+                                            <%--<th width="17%">*项目类型</th>--%>
+                                            <%--<th width="25%">*结算书编号</th>--%>
+                                            <th width="33%">*供应商</th>
+                                            <th width="22%" style="text-align: center">操作</th>
+                                        </tr></thead>
+                                        <tbody id="tbody_List">
+
+                                        </tbody>
+                                    </table>
+                                </div>
+                             <div style="margin-top: 20px">
+                                <button id="mybtn" type="button" class="layui-btn" style="width: 70px;" onclick="okSubmit()">确定</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+             </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

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

@@ -0,0 +1,118 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>施工交底管理</title>
+	<meta name="decorator" content="ani"/>
+	<!-- SUMMERNOTE -->
+	<%@include file="/webpage/include/summernote.jsp" %>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+			jp.ajaxForm("#inputForm",function(data){
+				if(data.success){
+					jp.success(data.msg);
+					jp.go("${ctx}"+ data.body.targetUrl);
+				}else{
+					jp.error(data.msg);
+					$("#inputForm").find("button:submit").button("reset");
+				}
+			});
+
+
+			$('#acceptDate').datetimepicker({
+				format: "YYYY-MM-DD HH:mm:ss"
+			});
+			$('#examineDate').datetimepicker({
+				format: "YYYY-MM-DD HH:mm:ss"
+			});
+			//富文本初始化
+			$('#reason').summernote({
+				height: 300,
+				lang: 'zh-CN',
+				callbacks: {
+					onChange: function(contents, $editable) {
+						$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+					}
+				}
+			});
+
+			$("#${id}Button, #${id}Name").click(function(){
+				// 是否限制选择，如果限制，设置为disabled
+				if ($("#${id}Button").hasClass("disabled")){
+					return true;
+				}
+			});
+
+			$("#${id}DelButton").click(function(){
+				// 是否限制选择，如果限制，设置为disabled
+				if ($("#${id}Button").hasClass("disabled")){
+					return true;
+				}
+				// 清除
+				$("#${id}Id").val("");
+				$("#${id}Name").val("");
+				$("#${id}Name").focus();
+
+			});
+		});
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">
+	<div class="row">
+		<div class="col-md-12">
+			<div class="panel panel-primary">
+				<div class="panel-heading">
+					<h3 class="panel-title">
+						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+					</h3>
+				</div>
+				<div class="panel-body">
+					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/uploadSave" method="post" class="form-horizontal">
+						<form:hidden path="id"/>
+						<form:hidden path="act.taskId"/>
+						<form:hidden path="act.taskName"/>
+						<form:hidden path="act.taskDefKey"/>
+						<form:hidden path="act.procInsId"/>
+						<form:hidden path="act.procDefId"/>
+						<form:hidden id="flag" path="act.flag" />
+						<div class="form-group text-center">
+							<h3> 施工交底申请</h3>
+						</div>
+						<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">
+									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
+								</td>
+								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>文件上传：</label></td>
+								<td class="width-35">
+									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="${cxt}/freemarker"></sys:fileUpload>
+								</td>
+							</tr>
+							</tbody>
+						</table>
+						<div class="form-group">
+							<div class="col-lg-3"></div>
+								<div class="col-lg-6">
+									<div class="form-group text-center">
+										<div>
+											<button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>
+										</div>
+									</div>
+								</div>
+						</div>
+					</form:form>
+					<c:if test="${not empty construction.id}">
+						<act:flowChart procInsId="${construction.act.procInsId}"/>
+						<act:histoicFlow procInsId="${construction.act.procInsId}" />
+					</c:if>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/uploadList.js

@@ -0,0 +1,218 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#testPicTable').bootstrapTable({
+		 
+		  //请求方法
+               method: 'post',
+               //类型json
+               dataType: "json",
+               contentType: "application/x-www-form-urlencoded",
+               //显示检索按钮
+	           showSearch: true,
+               //显示刷新按钮
+               showRefresh: true,
+               //显示切换手机试图按钮
+               showToggle: true,
+               //显示 内容列下拉框
+    	       showColumns: true,
+    	       //显示到处按钮
+    	       showExport: true,
+    	       //显示切换分页按钮
+    	       showPaginationSwitch: true,
+    	       //最低显示2行
+    	       minimumCountColumns: 2,
+               //是否显示行间隔色
+               striped: true,
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+               cache: false,    
+               //是否显示分页（*）  
+               pagination: true,   
+                //排序方式 
+               sortOrder: "asc",  
+               //初始化加载第一页，默认第一页
+               pageNumber:1,   
+               //每页的记录行数（*）   
+               pageSize: 10,  
+               //可供选择的每页的行数（*）    
+               pageList: [10, 25, 50, 100],
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               url: "${ctx}/managementcenter/divide/data",
+               //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+               //queryParamsType:'',   
+               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               queryParams : function(params) {
+               	var searchParam = $("#searchForm").serializeJSON();
+               	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+               	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+               	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+                   return searchParam;
+               },
+               //分页方式：client客户端分页，server服务端分页（*）
+               sidePagination: "server",
+               contextMenuTrigger:"right",//pc端 按右键弹出菜单
+               contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+               contextMenu: '#context-menu',
+               onContextMenuItem: function(row, $el){
+                   if($el.data("item") == "edit"){
+                   		edit(row.id);
+                   }else if($el.data("item") == "view"){
+                       view(row.id);
+                   } else if($el.data("item") == "delete"){
+                        jp.confirm('确认要删除该图片管理记录吗？', function(){
+                       	jp.loading();
+                       	jp.get("${ctx}/test/pic/testPic/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#testPicTable').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+                   	   
+                   	});
+                      
+                   } 
+               },
+              
+               onClickRow: function(row, $el){
+               },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+               columns: [{
+		        field: 'path',
+		        title: '图片路径',
+		        sortable: true,
+		        sortName: 'path',
+		        formatter:function(value, row , index){
+		        	var valueArray = value.split("|");
+		        	var labelArray = [];
+		        	for(var i =0 ; i<valueArray.length; i++){
+		        		if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
+		        		{
+		        			labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
+		        		}else{
+		        			labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+		        		}
+		        	}
+		        	return labelArray.join(" ");
+		        }
+		       
+		    }]
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#testPicTable').bootstrapTable("toggleView");
+		}
+	  
+	  $('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#testPicTable').bootstrapTable('getSelections').length!=1);
+        });
+		  
+		$("#btnImport").click(function(){
+			jp.open({
+			    type: 2,
+                area: [500, 200],
+                auto: true,
+			    title:"导入数据",
+			    content: "${ctx}/tag/importExcel" ,
+			    btn: ['下载模板','确定', '关闭'],
+				    btn1: function(index, layero){
+					  jp.downloadFile('${ctx}/test/pic/testPic/import/template');
+				  },
+			    btn2: function(index, layero){
+				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+						iframeWin.contentWindow.importExcel('${ctx}/test/pic/testPic/import', function (data) {
+							if(data.success){
+								jp.success(data.msg);
+								refresh();
+							}else{
+								jp.error(data.msg);
+							}
+                            jp.close(index);
+                        });//调用保存事件
+                    return false;
+				  },
+				 
+				  btn3: function(index){ 
+					  jp.close(index);
+	    	       }
+			}); 
+		});
+		
+		
+	 $("#export").click(function(){//导出Excel文件
+			jp.downloadFile('${ctx}/test/pic/testPic/export');
+	  });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#testPicTable').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#testPicTable').bootstrapTable('refresh');
+		});
+		
+		
+	});
+		
+  function getIdSelections() {
+        return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除该图片管理记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#testPicTable').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#testPicTable').bootstrapTable('refresh');
+  }
+  
+   function add(){
+	  jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
+  }
+
+
+  
+   function edit(id){//没有权限时，不显示确定按钮
+       if(id == undefined){
+	      id = getIdSelections();
+	}
+	jp.openSaveDialog('编辑图片管理', "${ctx}/test/pic/testPic/form?id=" + id, '800px', '500px');
+  }
+  
+ function view(id){//没有权限时，不显示确定按钮
+      if(id == undefined){
+             id = getIdSelections();
+      }
+        jp.openViewDialog('查看图片管理', "${ctx}/test/pic/testPic/form?id=" + id, '800px', '500px');
+ }
+
+
+
+</script>

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

@@ -0,0 +1,50 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>图片管理管理</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="uploadList.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">文件管理列表</h3>
+	</div>
+	<div class="panel-body">
+	
+	<!-- 搜索 -->
+	<div id="search-collapse" class="collapse">
+		<div class="accordion-inner">
+			<form:form id="searchForm" modelAttribute="construction" class="form form-horizontal well clearfix">
+				<input type="hidden" value="">
+		 <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>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>