Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/information/entity/constant.java

@@ -0,0 +1,24 @@
+package com.jeeplus.modules.sg.information.entity;
+/**
+ * 用于记录项目中的一些常量存储
+ * */
+public class constant {
+    private String overType;
+    private String overTime;
+
+    public String getOverType() {
+        return overType;
+    }
+
+    public void setOverType(String overType) {
+        this.overType = overType;
+    }
+
+    public String getOverTime() {
+        return overTime;
+    }
+
+    public void setOverTime(String overTime) {
+        this.overTime = overTime;
+    }
+}

src/main/java/com/jeeplus/modules/sg/information/mapper/InformationMapper.java

@@ -7,6 +7,7 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.information.entity.Information;
 import com.jeeplus.modules.sg.information.entity.append;
+import com.jeeplus.modules.sg.information.entity.constant;
 import com.jeeplus.modules.sg.material.entity.Material;
 import org.apache.ibatis.annotations.Param;
 
@@ -56,4 +57,9 @@ public interface InformationMapper extends BaseMapper<Information> {
 
     //根据页面得到项目定义号
     List<Information> findIdByList(List<Information> list);
+
+    //获取超期时间节点
+    String findOverTime(String overType);
+
+    int updateConstant(constant constant);
 }

src/main/java/com/jeeplus/modules/sg/information/mapper/xml/InformationMapper.xml

@@ -520,4 +520,12 @@
 			</foreach>
 		</where>
 	</select>
+
+	<select id="findOverTime" resultType="string">
+		select overTime from project_constant where overType = #{overType} ;
+	</select>
+
+	<update id="updateConstant" parameterType="com.jeeplus.modules.sg.information.entity.constant">
+		update project_constant set overTime = #{overTime} where overType = 'overTime';
+	</update>
 </mapper>

src/main/java/com/jeeplus/modules/sg/information/service/InformationService.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 import com.jeeplus.modules.sg.information.entity.Information;
 import com.jeeplus.modules.sg.information.entity.append;
+import com.jeeplus.modules.sg.information.entity.constant;
 import com.jeeplus.modules.sg.information.mapper.InformationMapper;
 import com.jeeplus.modules.sg.material.entity.Material;
 import io.swagger.models.auth.In;
@@ -49,13 +50,14 @@ public class InformationService extends CrudService<InformationMapper, Informati
 
 		Page<Information> page1 = super.findPage(page, entity);
 		List<Information> list = page1.getList();
+		String find = informationMapper.findOverTime("overTime");
+		int overTime = Integer.parseInt(find);
 		Calendar cal = Calendar.getInstance();
 		long between_days = 0;
 		for (Information in : list) {
 			//判断审定日期是否为空
 //			if (in.getApprovalDate() != null) {
 				//格式化审定日期
-
 				if ("否".equals(in.getFirstFinish()) || "否".equals(in.getSecondFinish())) {
 					in.setComplete("否");
 					if (in.getApprovalDate() != null) {
@@ -77,7 +79,7 @@ public class InformationService extends CrudService<InformationMapper, Informati
 								long secondDate = cal.getTimeInMillis();
 								between_days = (secondDate - appDay) / (1000 * 3600 * 24);
 								in.setFinishDate(String.valueOf(between_days) + "天");
-								if (between_days > 14) {
+								if (between_days > overTime) {
 									in.setOverdue("是");
 								} else {
 									in.setOverdue("否");
@@ -87,7 +89,7 @@ public class InformationService extends CrudService<InformationMapper, Informati
 								long firstDate = cal.getTimeInMillis();
 								between_days = (firstDate - appDay) / (1000 * 3600 * 24);
 								in.setFinishDate(String.valueOf(between_days) + "天");
-								if (between_days > 14) {
+								if (between_days > overTime) {
 									in.setOverdue("是");
 								} else {
 									in.setOverdue("否");
@@ -163,6 +165,8 @@ public class InformationService extends CrudService<InformationMapper, Informati
 
 	public List<Information> exportInfor(List<Information> list) {
 		List<Information> informationList = informationMapper.exportInfor(list);
+		String find = informationMapper.findOverTime("overTime");
+		int overTime = Integer.parseInt(find);
 		Calendar cal = Calendar.getInstance();
 		long between_days = 0;
 		for (Information in : informationList) {
@@ -187,7 +191,7 @@ public class InformationService extends CrudService<InformationMapper, Informati
 							long secondDate = cal.getTimeInMillis();
 							between_days = (secondDate - appDay) / (1000 * 3600 * 24);
 							in.setFinishDate(String.valueOf(between_days) + "天");
-							if (between_days > 14) {
+							if (between_days > overTime) {
 								in.setOverdue("是");
 							} else {
 								in.setOverdue("否");
@@ -197,7 +201,7 @@ public class InformationService extends CrudService<InformationMapper, Informati
 							long firstDate = cal.getTimeInMillis();
 							between_days = (firstDate - appDay) / (1000 * 3600 * 24);
 							in.setFinishDate(String.valueOf(between_days) + "天");
-							if (between_days > 14) {
+							if (between_days > overTime) {
 								in.setOverdue("是");
 							} else {
 								in.setOverdue("否");
@@ -212,6 +216,8 @@ public class InformationService extends CrudService<InformationMapper, Informati
 
 	public List<Information> export(List<Information> list) {
 		List<Information> export = informationMapper.export(list);
+		String find = informationMapper.findOverTime("overTime");
+		int overTime = Integer.parseInt(find);
 		Calendar cal = Calendar.getInstance();
 		long between_days = 0;
 		for (Information in : export) {
@@ -236,7 +242,7 @@ public class InformationService extends CrudService<InformationMapper, Informati
 							long secondDate = cal.getTimeInMillis();
 							between_days = (secondDate - appDay) / (1000 * 3600 * 24);
 							in.setFinishDate(String.valueOf(between_days) + "天");
-							if (between_days > 14) {
+							if (between_days > overTime) {
 								in.setOverdue("是");
 							} else {
 								in.setOverdue("否");
@@ -246,7 +252,7 @@ public class InformationService extends CrudService<InformationMapper, Informati
 							long firstDate = cal.getTimeInMillis();
 							between_days = (firstDate - appDay) / (1000 * 3600 * 24);
 							in.setFinishDate(String.valueOf(between_days) + "天");
-							if (between_days > 14) {
+							if (between_days > overTime) {
 								in.setOverdue("是");
 							} else {
 								in.setOverdue("否");
@@ -263,4 +269,13 @@ public class InformationService extends CrudService<InformationMapper, Informati
 	public List<Information> findIdByList(List<Information> list) {
 		return informationMapper.findIdByList(list);
 	}
+
+	public String findOverTime(String overType){
+		return informationMapper.findOverTime(overType);
+	}
+
+	@Transactional(readOnly = false)
+	public int updateConstant(constant constant) {
+		return informationMapper.updateConstant(constant);
+	}
 }

src/main/java/com/jeeplus/modules/sg/information/web/InformationController.java

@@ -22,6 +22,7 @@ import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.modules.sg.information.entity.Information;
 import com.jeeplus.modules.sg.information.entity.InformationDto;
 import com.jeeplus.modules.sg.information.entity.append;
+import com.jeeplus.modules.sg.information.entity.constant;
 import com.jeeplus.modules.sg.information.service.InformationService;
 import com.jeeplus.modules.sg.information.utils.FreemarkerUtil;
 import com.jeeplus.modules.sg.information.utils.ImportInformation;
@@ -33,6 +34,8 @@ import freemarker.template.Template;
 import io.swagger.models.auth.In;
 import net.sf.ehcache.util.concurrent.ConcurrentHashMap;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.session.Session;
 import org.h2.util.New;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +53,7 @@ import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
+import sun.tools.jconsole.JConsole;
 
 import static org.quartz.jobs.FileScanJob.FILE_NAME;
 
@@ -82,7 +86,7 @@ public class InformationController extends BaseController {
 	/**
 	 * 项目管理列表页
 	 */
-	//@RequiresPermissions("test:information:information:list")
+	@RequiresPermissions("modules:sg:information:information:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(Information information, Model model) {
 		model.addAttribute("informationList", information);
@@ -93,7 +97,7 @@ public class InformationController extends BaseController {
 	 * 项目管理列表数据
 	 */
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:list")
+	@RequiresPermissions("modules:sg:information:information:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Information information, HttpServletRequest request, HttpServletResponse response, Model model) {
 		HttpSession session = request.getSession();
@@ -103,19 +107,42 @@ public class InformationController extends BaseController {
 	}
 
 
+	@RequiresPermissions(value={"modules:sg:information:information:view","modules:sg:information:information:add","modules:sg:information:information:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Information information, Model model) {
 		model.addAttribute("Information", information);
 		return "modules/sg/information/informationForm";
 	}
 
+	//配置超期时间节点页
+	@RequiresPermissions(value={"modules:sg:information:information:add","modules:sg:information:information:edit"},logical=Logical.OR)
+	@RequestMapping(value = "editOverTime")
+	public String constant(constant constant, Model model) {
+		String overTime = informationService.findOverTime("overTime");
+		constant.setOverTime(overTime);
+		model.addAttribute("constant", constant);
+		return "modules/sg/information/constantForm";
+	}
+
+	//变更超期时间节点
+	@RequiresPermissions(value={"modules:sg:information:information:add","modules:sg:information:information:edit"},logical=Logical.OR)
+	@RequestMapping(value = "updateConstant")
+	@ResponseBody
+	public String updateConstant(constant constant) {
+		int count = informationService.updateConstant(constant);
+		if (count > 0 ) {
+			return "修改成功";
+		} else {
+			return "修改失败";
+		}
+	}
 
 
 
 	/**
 	 * 导入甲供物资Excel数据
 	 */
-	//@RequiresPermissions("test:onetomany:dialog:information:import")
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
     @RequestMapping(value = "import")
    	public AjaxJson importFile(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
@@ -145,6 +172,7 @@ public class InformationController extends BaseController {
 	/**
 	 *	导入综合信息Excel数据
 	 * */
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
 	@RequestMapping(value = "importCom")
 	public AjaxJson importFileCom(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
@@ -169,7 +197,7 @@ public class InformationController extends BaseController {
 
 
 
-
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
 	@RequestMapping(value = "importInTrial")
 	public AjaxJson importInTrial(@RequestParam("file")MultipartFile file, HttpServletResponse response, HttpServletRequest request) {
@@ -192,7 +220,7 @@ public class InformationController extends BaseController {
 		return j;
 	}
 
-
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
 	@RequestMapping(value = "btnSearch")
 	public Map<String, Object> btnSearch(@RequestParam("file")MultipartFile file, Information information, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -245,6 +273,7 @@ public class InformationController extends BaseController {
 		}
 
 	//导入原因类型
+	@RequiresPermissions("modules:sg:information:information:import")
 	@ResponseBody
 	@RequestMapping(value = "btnInReason")
 	public AjaxJson btnInReason(@RequestParam("file")MultipartFile file, Information information, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -285,7 +314,7 @@ public class InformationController extends BaseController {
 	 * 批量导入模板
 	 * */
 	@ResponseBody
-//	@RequiresPermissions("test:onetomany:form:testDataMain2:import")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "import/template")
 	public AjaxJson importFileTemplate(HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
@@ -302,8 +331,11 @@ public class InformationController extends BaseController {
 	}
 
 
+	/**
+	 * 导入送审模板下载
+	 * */
 	@ResponseBody
-//	@RequiresPermissions("test:onetomany:form:testDataMain2:import")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "import/templates")
 	public AjaxJson importFileTemplateS(HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();
@@ -325,7 +357,7 @@ public class InformationController extends BaseController {
 
 	public static Map<String, ExportExcel> excelParamCache = new ConcurrentHashMap<>();
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "exportMaterial")
 	public AjaxJson exportMaterial(Information information,HttpServletRequest request, HttpServletResponse response) {
 		String projectId = "";
@@ -407,7 +439,7 @@ public class InformationController extends BaseController {
 
 
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "export")
 	public AjaxJson export(Information information,HttpServletRequest request, HttpServletResponse response) {
 		String projectId = "";
@@ -489,7 +521,7 @@ public class InformationController extends BaseController {
 
 	//导出word
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
+	@RequiresPermissions("modules:sg:information:information:export")
 	@RequestMapping(value = "exportInformation")
 	public void exportInformation(Information information,HttpServletRequest request, HttpServletResponse response) {
 		String projectId = "";

src/main/java/com/jeeplus/modules/sg/material/mapper/MaterialMapper.java

@@ -47,5 +47,6 @@ public interface MaterialMapper extends BaseMapper<Material> {
 
     List<Material> findStatus();
 
+    String findNeedBack(String id);
 
 }

src/main/java/com/jeeplus/modules/sg/material/mapper/xml/MaterialMapper.xml

@@ -316,4 +316,8 @@
     <select id="findStatus" resultType="com.jeeplus.modules.sg.material.entity.Material">
         select * from material_information where status is not null
     </select>
+
+    <select id="findNeedBack" resultType="string">
+        select isBack from material_information where id = #{id};
+    </select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/material/service/MaterialService.java

@@ -114,5 +114,8 @@ public class MaterialService extends CrudService<MaterialMapper, Material> {
 		return materialMapper.findStatus();
 	}
 
+	public String findNeedBack(String id) {
+		return materialMapper.findNeedBack(id);
+	}
 
 }

src/main/java/com/jeeplus/modules/sg/material/web/MaterialController.java

@@ -14,6 +14,8 @@ import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.modules.sg.information.entity.Information;
 import com.jeeplus.modules.sg.material.entity.Material;
 import com.jeeplus.modules.sg.material.service.MaterialService;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -53,7 +55,7 @@ public class MaterialController extends BaseController {
 	/**
 	 * 物料详情列表页
 	 */
-	//@RequiresPermissions("test:information:information:list")
+	@RequiresPermissions("modules:sg:material:material:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(Material material, Model model) {
 		model.addAttribute("materialList", material);
@@ -65,29 +67,50 @@ public class MaterialController extends BaseController {
 	 * 物料详情列表数据
 	 */
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:list")
+	@RequiresPermissions("modules:sg:material:material:list")
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Material material, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<Material> page = materialService.findPage(new Page<Material>(request, response), material);
 		return getBootstrapData(page);
 	}
 
+	@RequiresPermissions(value={"modules:sg:material:material:view","modules:sg:material:material:add","modules:sg:material:material:edit"},logical= Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(Material material, Model model) {
 		model.addAttribute("Material", material);
 		return "modules/sg/material/materialForm";
 	}
 
+
+	/**
+	 * 修改未完成领退料物料原因
+	 * */
+	@RequiresPermissions(value={"modules:sg:material:material:add","modules:sg:material:material:edit"},logical=Logical.OR)
 	@RequestMapping(value = "update")
 	@ResponseBody
 	public String updateInfo(Material material) {
-		Integer s = materialService.updateInfo(material);
-		if (s > 0 ) {
+		Integer count = materialService.updateInfo(material);
+		if (count > 0 ) {
 			return "修改成功";
 		} else {
 			return "修改失败";
 		}
 	}
+
+
+	/**
+	 * 用来读取当前数据是否完成领退料-未使用
+	 * */
+/*	@RequestMapping(value = "findNeedBack")
+	@ResponseBody
+	public String findNeedBack(String id) {
+		String s = materialService.findNeedBack(id);
+		if (s.equals("是")) {
+			return "是";
+		} else {
+			return "否";
+		}
+	}*/
 /*
 	*/
 /**
@@ -95,7 +118,7 @@ public class MaterialController extends BaseController {
 	 */
 
 	@ResponseBody
-	//@RequiresPermissions("test:onetomany:dialog:testDataMain1:export")
+	@RequiresPermissions("modules:sg:material:material:export")
     @RequestMapping(value = "export")
     public AjaxJson exportFile(Material material, HttpServletRequest request, HttpServletResponse response) {
 		AjaxJson j = new AjaxJson();

src/main/java/com/jeeplus/modules/sg/record/entity/Record.java

@@ -0,0 +1,46 @@
+package com.jeeplus.modules.sg.record.entity;
+
+import com.jeeplus.core.persistence.DataEntity;
+
+public class Record extends DataEntity<Record> {
+    //记录导入综合信息表是否完成
+    private String information;
+    //记录导入甲供材表是否完成
+    private String material;
+    //导入人
+    private String importUser;
+    //同步时间
+    private String importDate;
+
+    public String getInformation() {
+        return information;
+    }
+
+    public void setInformation(String information) {
+        this.information = information;
+    }
+
+    public String getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(String material) {
+        this.material = material;
+    }
+
+    public String getImportUser() {
+        return importUser;
+    }
+
+    public void setImportUser(String importUser) {
+        this.importUser = importUser;
+    }
+
+    public String getImportDate() {
+        return importDate;
+    }
+
+    public void setImportDate(String importDate) {
+        this.importDate = importDate;
+    }
+}

src/main/java/com/jeeplus/modules/sg/record/mapper/RecordMapper.java

@@ -0,0 +1,25 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.record.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.information.entity.Information;
+import com.jeeplus.modules.sg.information.entity.append;
+import com.jeeplus.modules.sg.information.entity.constant;
+import com.jeeplus.modules.sg.material.entity.Material;
+import com.jeeplus.modules.sg.record.entity.Record;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目管理MAPPER接口
+ * @author
+ * @version
+ */
+@MyBatisMapper
+public interface RecordMapper extends BaseMapper<Record> {
+
+}

src/main/java/com/jeeplus/modules/sg/record/mapper/xml/RecordMapper.xml

@@ -0,0 +1,70 @@
+<?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.record.mapper.RecordMapper">
+
+    <sql id="recordColumns">
+		id,
+		information,
+		material,
+		importUser,
+		importDate
+	</sql>
+
+	<select id="get" resultType="Record" >
+		SELECT
+		<include refid="recordColumns"/>
+		FROM project_record a
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="Record" >
+		SELECT
+		<include refid="recordColumns"/>
+		FROM project_record a
+<!--		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+			<if test="tuser != null and tuser.id != null and tuser.id != ''">
+				AND a.user_id = #{tuser.id}
+			</if>
+			<if test="name != null and name != ''">
+				AND a.name LIKE
+				<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
+			</if>
+			<if test="sex != null and sex != ''">
+				AND a.sex = #{sex}
+			</if>
+			<if test="beginInDate != null and endInDate != null ">
+				AND a.in_date BETWEEN #{beginInDate} AND #{endInDate}
+			</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="Record" >
+		SELECT
+		<include refid="recordColumns"/>
+		FROM project_record 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>
+</mapper>

src/main/java/com/jeeplus/modules/sg/record/service/RecordService.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.record.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.information.entity.Information;
+import com.jeeplus.modules.sg.material.entity.Material;
+import com.jeeplus.modules.sg.material.mapper.MaterialMapper;
+import com.jeeplus.modules.sg.record.entity.Record;
+import com.jeeplus.modules.sg.record.mapper.RecordMapper;
+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
+ */
+@Service
+@Transactional(readOnly = true)
+public class RecordService extends CrudService<RecordMapper, Record> {
+
+	@Autowired
+	private RecordMapper recordMapper;
+
+	public Record get(String id) {
+		Record record = super.get(id);
+		return record;
+	}
+
+	public List<Record> findList(Record record) {
+		return super.findList(record);
+	}
+
+	public Page<Record> findPage(Page<Record> page, Record entity) {
+		return super.findPage(page, entity);
+	}
+
+	@Override
+	public List<Record> findListBy(List<Record> entity) {
+		return super.findListBy(entity);
+	}
+
+}

src/main/java/com/jeeplus/modules/sg/record/web/RecordController.java

@@ -0,0 +1,77 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.record.web;
+
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.sg.information.entity.Information;
+import com.jeeplus.modules.sg.information.service.InformationService;
+import com.jeeplus.modules.sg.material.entity.Material;
+import com.jeeplus.modules.sg.material.service.MaterialService;
+import com.jeeplus.modules.sg.record.entity.Record;
+import com.jeeplus.modules.sg.record.service.RecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * 项目管理列表Controller
+ * @author
+ * @version
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/sg/record")
+public class RecordController extends BaseController {
+
+	@Autowired
+	private InformationService informationService;
+	@Autowired
+	private RecordService recordService;
+
+	@ModelAttribute
+	public Record get(@RequestParam(required=false) String id) {
+		Record entity = null;
+		if (StringUtils.isNotBlank(id)){
+			recordService.get(id);
+		}
+		if (entity == null){
+			entity = new Record();
+		}
+		return entity;
+	}
+
+	/**
+	 * 项目管理列表页
+	 */
+//	@RequiresPermissions("modules:sg:information:information:list")
+	@RequestMapping(value = {"list", ""})
+	public String list(Record record, Model model) {
+		model.addAttribute("recordList", record);
+		return "modules/sg/record/recordList";
+	}
+
+		/**
+	 * 项目管理列表数据
+	 */
+	@ResponseBody
+//	@RequiresPermissions("modules:sg:information:information:list")
+	@RequestMapping(value = "data")
+	public Map<String, Object> data(Record record, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<Record> page = recordService.findPage(new Page<Record>(request, response), record);
+		return getBootstrapData(page);
+	}
+
+
+}
+
+

src/main/webapp/webpage/modules/sg/information/constantForm.jsp

@@ -0,0 +1,56 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<script src="/${ctx}/act/rest/js/common/jquery-1.8.3.js"></script>
+	<title>物料详细</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$("#saveInfo").click(function () {
+				$.ajax({
+					url: "${ctx}/sg/information/updateConstant",
+					type: "post",
+					data: $("form").serialize(),
+					dataType: "text",
+					success: function (data) {
+						console.log(data)
+						if (data == "修改成功") {
+							jp.success("修改成功");
+							jp.getParent().refresh();
+							var index = parent.layer.getFrameIndex(window.name);
+							jp.close(index);
+						} else {
+							jp.error("修改失败");
+							jp.getParent().refresh();
+							var index = parent.layer.getFrameIndex(window.name);
+							jp.close(index)
+						}
+					}
+				});
+			})
+		});
+	</script>
+</head>
+<body class="bg-white">
+		<form:form id="inputForm"  modelAttribute="constant" method="post" class="form-horizontal">
+		<table class="table table-bordered" style="margin: 0 auto;text-align: center;width: 600px">
+		   <tbody>
+				<tr>
+					<td class="width-35" style="text-align: center;margin: 0 auto">
+						<label class="pull-right"><font color="red">*</font>配置超期时间节点：</label>
+					</td>
+					<td class="width-35" style="text-align: center;margin: 0 auto">
+						<form:input path="overTime"  id="overTime" htmlEscape="false" cssClass="form-control" />
+					</td>
+				</tr>
+				<tr>
+					<td class="width-35" style="text-align: center;margin: 0 auto" colspan="2">
+						<input type="button" id="saveInfo" value="保存"  class="btn btn-primary btn-block btn-lg btn-parsley"/>
+					</td>
+		  		</tr>
+		 	</tbody>
+		</table>
+		</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/information/informationList.js

@@ -1,8 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
-
 $(document).ready(function() {
-
 	//定义方法---在bootstrap数据循环中使用，必须定义在bootstrapTable之前
 	window.operateEvents = {
 		'click #TableView': function (e, value, row, index) {
@@ -10,7 +8,6 @@ $(document).ready(function() {
 		}
 	};
 	var h = $(window).height() - 100;
-
 	//bootstrapTable加载数据
 	$('#informationTable').bootstrapTable({
 		  //请求方法
@@ -458,6 +455,10 @@ $(document).ready(function() {
 		jp.downloadFile('${ctx}/sg/information/exportInformation?projectId='+projectId+'&projectName='+projectName+'&projectType='+projectType+'&projectYear='+projectYear+'&firstUnits='+firstUnits+'&secondUnits='+secondUnits);
 	});
 
+	$("#editOverTime").click(function () {
+		jp.openViewDialog('配置超期时间','${ctx}/sg/information/editOverTime','1000px','800px');
+	});
+
 	// 绑定查询按扭
 	$("#search").click("click", function() {
 		  sessionStorage.removeItem("path");
@@ -480,6 +481,7 @@ $(document).ready(function() {
 
 
 
+
     //刷新列表
   function refresh() {
       $('#informationTable').bootstrapTable('refresh');

src/main/webapp/webpage/modules/sg/information/informationList.jsp

@@ -75,47 +75,60 @@
 	
 	<!-- 工具栏 -->
 	<div id="toolbar">
-		<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
+		<input id="excelFile" type="file" value="导入综合信息表" class="btn btn-info">
+		<shiro:hasPermission name="modules:sg:information:information:import">
 			<button id="btnCom" class="btn btn-info">
 				<i class="fa fa-folder-open-o"></i> 导入综合信息表
 			</button>
 		</shiro:hasPermission>
-			<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
-				<button id="btnInformation" class="btn btn-info">
-					<i class="fa fa-folder-open-o"></i> 导入甲供材
-				</button>
-			</shiro:hasPermission>
-		<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
+		<shiro:hasPermission name="modules:sg:information:information:import">
+			<button id="btnInformation" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导入甲供材
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="modules:sg:information:information:import">
 			<button id="btnInReason" class="btn btn-info">
 				<i class="fa fa-folder-open-o"></i> 导入原因类型
 			</button>
 		</shiro:hasPermission>
-		<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
+		<shiro:hasPermission name="modules:sg:information:information:import">
 			<button id="btnInTrial" class="btn btn-info">
 				<i class="fa fa-folder-open-o"></i> 导入送审
 			</button>
 		</shiro:hasPermission>
-		<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:add">
+		<shiro:hasPermission name="modules:sg:information:information:import">
 			<button id="btnSearch" class="btn btn-info">
 				<i class="fa fa-folder-open-o"></i> 导入查询
 			</button>
 		</shiro:hasPermission>
-		<button id="exportMaterial" class="btn btn-warning">
-			<i class="fa fa-file-excel-o"></i> 导出项目
-		</button>
-		<button id="export" class="btn btn-warning">
-			<i class="fa fa-file-excel-o"></i> 导出物料清单
-		</button>
-		<button id="exportInformation" class="btn btn-warning">
-			<i class="fa fa-file-excel-o"></i> 导出欠供说明
-		</button>
+		<shiro:hasPermission name="modules:sg:information:information:export">
+			<button id="exportMaterial" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出项目
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="modules:sg:information:information:export">
+			<button id="export" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出物料清单
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="modules:sg:information:information:export">
+			<button id="exportInformation" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出欠供说明
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="modules:sg:information:information:edit">
+			<button id="editOverTime" class="btn btn-danger">
+				<i class="fa fa-file-excel-o"></i> 配置超期时间
+			</button>
+		</shiro:hasPermission>
+
 		    </div>
 		
 	<!-- 表格 -->
 	<table id="informationTable"   data-toolbar="#toolbar"></table>
 
     <!-- context menu -->
-    <ul id="context-menu" class="dropdown-menu">
+    <%--<ul id="context-menu" class="dropdown-menu">
     	<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
         <li data-item="view"><a>查看</a></li>
         </shiro:hasPermission>
@@ -126,7 +139,7 @@
         <li data-item="delete"><a>删除</a></li>
         </shiro:hasPermission>
         <li data-item="action1"><a>取消</a></li>
-    </ul>  
+    </ul>  --%>
 	</div>
 	</div>
 	</div>

src/main/webapp/webpage/modules/sg/material/materialForm.jsp

@@ -3,7 +3,6 @@
 <html>
 <head>
 	<script src="/${ctx}/act/rest/js/common/jquery-1.8.3.js"></script>
-
 	<title>物料详细</title>
 	<meta name="decorator" content="ani"/>
 	<script type="text/javascript">
@@ -13,7 +12,7 @@
 					url: "${ctx}/sg/material/update",
 					type: "post",
 					data: $("form").serialize(),
-					dataType: "json",
+					dataType: "text",
 					success: function (data) {
 						console.log(data);
 						if (data == "修改成功") {

src/main/webapp/webpage/modules/sg/material/materialList.js

@@ -156,11 +156,17 @@ $(document).ready(function() {
 		});
 
 	function operateFormatter(value, row, index) {
-		return [
-			'<input id="TableView" type="button" value="调整" class="btn btn-default">',
-		].join('');
+		if (row.isBack == "是") {
+
+		} else {
+			return [
+				'<input id="TableView" type="button" value="调整" class="btn btn-default">'
+			].join('');
+		}
 	}
 
+
+
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 		  $('#informationTable').bootstrapTable("toggleView");
 		}

src/main/webapp/webpage/modules/sg/material/materialList.jsp

@@ -37,18 +37,17 @@
 	
 	<!-- 工具栏 -->
 			<div id="toolbar">
-<%--			<shiro:hasPermission name="test:onetomany:dialog:materialList:add">--%>
-			<button id="export" class="btn btn-warning">
-				<i class="fa fa-file-excel-o"></i> 导出
-			</button>
-<%--			</shiro:hasPermission>--%>
+				<shiro:hasPermission name="test:onetomany:dialog:materialList:export">
+					<button id="export" class="btn btn-warning">
+						<i class="fa fa-file-excel-o"></i> 导出
+					</button>
+				</shiro:hasPermission>
 		    </div>
 		
 	<!-- 表格 -->
 	<table id="informationTable"   data-toolbar="#toolbar"></table>
-
     <!-- context menu -->
-    <ul id="context-menu" class="dropdown-menu">
+<%--    <ul id="context-menu" class="dropdown-menu">
     	<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
         <li data-item="view"><a>查看</a></li>
         </shiro:hasPermission>
@@ -59,7 +58,7 @@
         <li data-item="delete"><a>删除</a></li>
         </shiro:hasPermission>
         <li data-item="action1"><a>取消</a></li>
-    </ul>  
+    </ul>  --%>
 	</div>
 	</div>
 	</div>

src/main/webapp/webpage/modules/sg/record/recordList.js

@@ -0,0 +1,159 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+
+$(document).ready(function() {
+
+	$('#informationTable').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}/sg/record/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',
+               onClickRow: function(row, $el){
+               },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+			},
+               columns: [ {
+				   field: 'information',
+				   title: '综合信息表是否完成',
+					visible:true
+			   },{
+				   field: 'material',
+				   title: '甲供材表是否完成',
+				   visible:true
+			   },{
+				   field: 'importUser',
+				   title: '导入人',
+				   visible:true
+			   },{
+				   field: 'importDate',
+				   title: '同步时间',
+				   visible:true
+			   }
+
+		     ]
+		});
+
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+		  $('#informationTable').bootstrapTable("toggleView");
+		}
+
+	  $('#informationTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#informationTable').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#informationTable').bootstrapTable('getSelections').length!=1);
+        });
+
+
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#informationTable').bootstrapTable('refresh');
+		});
+
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $('#informationTable').bootstrapTable('refresh');
+		});
+
+	document.getElementById("btnCom").addEventListener("change",function () {
+		console.log("change");
+		var val = $("#btnCom").val();
+		console.log(val);
+		if (val != '') {
+			$("table:eq(0) tr:eq(1) td:eq(0)").html('完成');
+
+			$("table:eq(0) tr:eq(1) td:eq(1)").text();
+		} else {
+			$("table:eq(0) tr:eq(1) td:eq(0)").html('-');
+		}
+		change()
+	});
+
+	document.getElementById("btnInformation").addEventListener("change",function () {
+		console.log("change");
+		var val = $("#btnInformation").val();
+		console.log(val);
+		if (val != '') {
+			$("table:eq(0) tr:eq(1) td:eq(1)").html('完成');
+		} else {
+			$("table:eq(0) tr:eq(1) td:eq(1)").html('-');
+		}
+		change()
+	});
+
+	function change() {
+		var btnCom = $("table:eq(0) tr:eq(1) td:eq(0)").text();
+		var btnInformation = $("table:eq(0) tr:eq(1) td:eq(1)").text();
+		console.log(btnCom);
+		console.log(btnInformation);
+		if (btnCom == '完成' && btnInformation == '完成') {
+			$('#exportMaterial').css({'display':'block','text-align':'center','margin':'0 auto'});
+		} else {
+			$('#exportMaterial').css('display','none');
+		}
+	}
+
+	});
+
+    //刷新列表
+  function refresh() {
+      $('#informationTable').bootstrapTable('refresh');
+  }
+
+	function addRow(list, idx, tpl, row){
+		$(list).append(Mustache.render(tpl, {
+			idx: idx, delBtn: true, row: row
+		}));
+	}
+
+
+
+
+</script>

src/main/webapp/webpage/modules/sg/record/recordList.jsp

@@ -0,0 +1,94 @@
+<%@ 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="recordList.js" %>
+	<style>
+		#record td {
+			border: 1px solid #dedede;
+			text-align: center;
+			margin: 0 auto;
+		}
+	</style>
+</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="record" class="form form-horizontal well clearfix">
+			 <div class="col-xs-12 col-sm-6 col-md-4">
+				<label class="label-item single-overflow pull-left" title="导入人：">导入人：</label>
+				 <form:input path="importUser" htmlEscape="false" maxlength="100"  class=" form-control"/>
+			</div>
+		 <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" style="float: left;display: flex">
+		<shiro:hasPermission name="test:onetomany:dialog:materialList:export">
+			<button id="export" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出
+			</button>
+		</shiro:hasPermission>
+		<form action="/$">
+		<input type="file" id="btnCom" class="btn btn-info" value="导入综合信息表"/>
+		</form>
+		<form action="/$">
+		<input style="margin-left: 10px" type="file" id="btnInformation" class="btn btn-info" value="导入甲供材"/>
+		</form>
+	</div>
+	<table id="record" width="100%" STYLE="border: 1px solid #dedede;">
+		<tr>
+			<td>综合信息表是否完成</td>
+			<td>甲供材表是否完成</td>
+			<td>操作</td>
+		</tr>
+		<tr>
+			<td>-</td>
+			<td>-</td>
+			<td width="100px">
+				<button id="exportMaterial" class="btn btn-warning" style="display: none">
+					<i class="fa fa-file-excel-o"></i> 同步
+				</button>
+			</td>
+		</tr>
+	</table>
+	<!-- 表格 -->
+	<table id="informationTable"   data-toolbar="#toolbar"></table>
+    <!-- context menu -->
+<%--    <ul id="context-menu" class="dropdown-menu">
+    	<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:view">
+        <li data-item="view"><a>查看</a></li>
+        </shiro:hasPermission>
+    	<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:edit">
+        <li data-item="edit"><a>编辑</a></li>
+        </shiro:hasPermission>
+        <shiro:hasPermission name="test:onetomany:dialog:testDataMain1:del">
+        <li data-item="delete"><a>删除</a></li>
+        </shiro:hasPermission>
+        <li data-item="action1"><a>取消</a></li>
+    </ul>  --%>
+	</div>
+	</div>
+	</div>
+</body>
+</html>