Merge remote-tracking branch 'origin/master'

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

@@ -1,7 +1,7 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.information.entity;
+package com.jeeplus.modules.sg.audit.information.entity;
 
 import java.util.Date;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.information.entity;
+package com.jeeplus.modules.sg.audit.information.entity;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 /**

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

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.information.entity;
+package com.jeeplus.modules.sg.audit.information.entity;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 

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

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.information.entity;
+package com.jeeplus.modules.sg.audit.information.entity;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 /**

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

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.information.entity;
+package com.jeeplus.modules.sg.audit.information.entity;
 /**
  * 用于记录项目中的一些常量存储 程序修改后暂未使用
  * */

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

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.information.entity;
+package com.jeeplus.modules.sg.audit.information.entity;
 
 import com.jeeplus.core.persistence.DataEntity;
 

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

@@ -1,14 +1,14 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.information.mapper;
+package com.jeeplus.modules.sg.audit.information.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.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.information.entity.append;
+import com.jeeplus.modules.sg.audit.information.entity.constant;
+import com.jeeplus.modules.sg.audit.material.entity.Material;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -65,4 +65,7 @@ public interface InformationMapper extends BaseMapper<Information> {
     int updateConstant(constant constant);
 
     List<Information> findListWord(Information entity);
+
+    //通过查询条件，查询所有未完成领退料的信息
+    List<Information> findNoFinishList(List<Information> list);
 }

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

@@ -1,6 +1,6 @@
 <?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.information.mapper.InformationMapper">
+<mapper namespace="com.jeeplus.modules.sg.audit.information.mapper.InformationMapper">
 
     <sql id="informationColumns">
 		id,
@@ -55,7 +55,7 @@
 		a.finishDate,
 		a.overdue
 	</sql>
-    <select id="findAllInformationList" resultType="com.jeeplus.modules.sg.information.entity.Information">
+    <select id="findAllInformationList" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		select project_id,project_name from sj_project_information
 	</select>
 
@@ -211,7 +211,7 @@
 		del_flag = #{delFlag}
 	</insert>
 
-    <update id="updateInformationDate" parameterType="com.jeeplus.modules.sg.information.entity.Information">
+    <update id="updateInformationDate" parameterType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		update sj_project_information set
 		approvalDate = #{approvalDate}
 		where project_Id = #{projectId} and project_Name = #{projectName}
@@ -227,7 +227,7 @@
 		and firstFinishDate is null
 	</update>
 
-    <select id="findInformationByID" resultType="com.jeeplus.modules.sg.information.entity.Information">
+    <select id="findInformationByID" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		select * from sj_project_information where project_Id = #{projectId} and project_Name = #{projectName}
 	</select>
 
@@ -387,7 +387,7 @@
 		</foreach>
 	</insert>
 
-	<select id="findListBy" resultType="com.jeeplus.modules.sg.information.entity.Information">
+	<select id="findListBy" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 			select
 			<include refid="informationColumns"/>
 			from sj_project_information
@@ -410,7 +410,7 @@
 			</foreach>
 	</select>
 
-	<select id="findListById" resultType="com.jeeplus.modules.sg.information.entity.Information">
+	<select id="findListById" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		select project_id,project_name,firstFinish,firstFinishDate,secondFinish,secondFinishDate from sj_project_information where project_Id=#{projectId}
 	</select>
 
@@ -436,7 +436,7 @@
 		</foreach>
 	</insert>
 
-	<select id="allNoBack" resultType="com.jeeplus.modules.sg.material.entity.Material">
+	<select id="allNoBack" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
 		select *
 		from sj_material_information
 		where project_Id in(
@@ -446,7 +446,7 @@
 		    )
 	</select>
 
-	<select id="allNo" resultType="com.jeeplus.modules.sg.material.entity.Material">
+	<select id="allNo" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
 		select *
 		from sj_material_information
 		where project_Id in(
@@ -456,7 +456,7 @@
 		)
 	</select>
 
-	<select id="exportInfor" resultType="com.jeeplus.modules.sg.information.entity.Information">
+	<select id="exportInfor" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		SELECT
 		a.*,b.trial,b.construction,b.outConstruction,b.settlement
 		FROM sj_project_information as a
@@ -468,7 +468,7 @@
 			)
 	</select>
 	
-	<select id="export" resultType="com.jeeplus.modules.sg.information.entity.Information">
+	<select id="export" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		SELECT
 		a.*,b.trial,b.construction,b.outConstruction,b.settlement,b.underCentralized
 		FROM sj_project_information as a
@@ -498,7 +498,7 @@
 
 	</select>
 
-	<select id="findIdByList" resultType="com.jeeplus.modules.sg.information.entity.Information">
+	<select id="findIdByList" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		SELECT
 		a.project_Id
 		FROM sj_project_information as a
@@ -532,12 +532,12 @@
 		select overTime from sj_project_constant where overType = #{overType} ;
 	</select>
 
-	<update id="updateConstant" parameterType="com.jeeplus.modules.sg.information.entity.constant">
+	<update id="updateConstant" parameterType="com.jeeplus.modules.sg.audit.information.entity.constant">
 		update sj_project_constant set overTime = #{overTime} where overType = 'overTime';
 	</update>
 
 
-	<select id="findListWord" resultType="com.jeeplus.modules.sg.information.entity.Information">
+	<select id="findListWord" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
 		SELECT
 		<include refid="newInformationColumns"/>,b.trial,b.construction,b.outConstruction,b.settlement,b.underCentralized,
 		datediff(if(firstFinish='否' or secondFinish = '否',NOW(),if(secondFinish = '是',secondFinishDate,firstFinishDate)),approvalDate) as newdate
@@ -618,4 +618,13 @@
 			</otherwise>
 		</choose>
 	</select>
+
+	<select id="findNoFinishList" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
+		select * from sj_project_information where(firstFinish ='否' or secondFinish = '否')
+		and project_Id in(
+		<foreach collection="list" item="items" index="index"  separator=",">
+			#{items.projectId}
+		</foreach>
+		)
+	</select>
 </mapper>

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

@@ -1,20 +1,17 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.information.service;
+package com.jeeplus.modules.sg.audit.information.service;
 
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 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.entity.searchDto;
-import com.jeeplus.modules.sg.information.mapper.InformationMapper;
-import com.jeeplus.modules.sg.material.entity.Material;
-import io.swagger.models.auth.In;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.information.entity.append;
+import com.jeeplus.modules.sg.audit.information.entity.constant;
+import com.jeeplus.modules.sg.audit.information.mapper.InformationMapper;
+import com.jeeplus.modules.sg.audit.material.entity.Material;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -101,6 +98,10 @@ public class InformationService extends CrudService<InformationMapper, Informati
 		return super.findAllList(entity);
 	}
 
+	public List<Information> findNoFinishList(List<Information> list) {
+		return informationMapper.findNoFinishList(list);
+	}
+
 	public Page<Information> findPage(Page<Information> page, Information entity) {
 		Page<Information> page1 = super.findPage(page, entity);
 		List<Information> list = page1.getList();

src/main/java/com/jeeplus/modules/sg/information/utils/FreemarkerUtil.java

@@ -1,6 +1,5 @@
-package com.jeeplus.modules.sg.information.utils;
+package com.jeeplus.modules.sg.audit.information.utils;
 
-import com.jeeplus.common.utils.excel.ExportExcel;
 import freemarker.template.Template;
 
 import java.io.File;

src/main/java/com/jeeplus/modules/sg/information/utils/ImportInformation.java

@@ -1,21 +1,17 @@
-package com.jeeplus.modules.sg.information.utils;
+package com.jeeplus.modules.sg.audit.information.utils;
 
-import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.common.utils.excel.ImportExcel;
-import com.jeeplus.modules.sg.information.entity.Information;
-import com.jeeplus.modules.sg.information.entity.append;
-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.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.information.entity.append;
+import com.jeeplus.modules.sg.audit.information.service.InformationService;
+import com.jeeplus.modules.sg.audit.material.entity.Material;
+import com.jeeplus.modules.sg.audit.material.service.MaterialService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import io.swagger.models.auth.In;
-import org.apache.ibatis.jdbc.Null;
 import org.apache.poi.ss.usermodel.Row;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.validation.ConstraintViolationException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 

src/main/java/com/jeeplus/modules/sg/information/utils/RandomUtil.java

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.information.utils;
+package com.jeeplus.modules.sg.audit.information.utils;
 
 import java.io.File;
 import java.text.SimpleDateFormat;

src/main/java/com/jeeplus/modules/sg/information/utils/ResponseUtil.java

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.information.utils;
+package com.jeeplus.modules.sg.audit.information.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/jeeplus/modules/sg/information/utils/SessionListener1.java

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.information.utils;
+package com.jeeplus.modules.sg.audit.information.utils;
 
 import org.apache.shiro.session.Session;
 import org.apache.shiro.session.SessionListener;

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

@@ -1,7 +1,7 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.information.web;
+package com.jeeplus.modules.sg.audit.information.web;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -19,16 +19,16 @@ import com.alibaba.fastjson.JSONObject;*/
 import com.google.common.collect.Lists;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.modules.sg.information.entity.*;
-import com.jeeplus.modules.sg.information.service.InformationService;
-import com.jeeplus.modules.sg.information.utils.FreemarkerUtil;
-import com.jeeplus.modules.sg.information.utils.ImportInformation;
-import com.jeeplus.modules.sg.information.utils.RandomUtil;
-import com.jeeplus.modules.sg.information.utils.ResponseUtil;
-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 com.jeeplus.modules.sg.audit.information.entity.*;
+import com.jeeplus.modules.sg.audit.information.service.InformationService;
+import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
+import com.jeeplus.modules.sg.audit.information.utils.ImportInformation;
+import com.jeeplus.modules.sg.audit.information.utils.RandomUtil;
+import com.jeeplus.modules.sg.audit.information.utils.ResponseUtil;
+import com.jeeplus.modules.sg.audit.material.entity.Material;
+import com.jeeplus.modules.sg.audit.material.service.MaterialService;
+import com.jeeplus.modules.sg.audit.record.entity.Record;
+import com.jeeplus.modules.sg.audit.record.service.RecordService;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 /*import io.swagger.models.auth.In;
@@ -92,7 +92,7 @@ public class InformationController extends BaseController {
     @RequestMapping(value = {"list", ""})
     public String list(Information information, Model model) {
         model.addAttribute("informationList", information);
-        return "modules/sg/information/informationList";
+        return "modules/sg/audit/information/informationList";
     }
 
     /**
@@ -146,18 +146,20 @@ public class InformationController extends BaseController {
     @RequestMapping(value = "form")
     public String form(Information information, Model model) {
         model.addAttribute("Information", information);
-        return "modules/sg/information/informationForm";
+        return "modules/sg/audit/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";
+        return "modules/sg/audit/information/constantForm";
     }
+*/
 
     //变更超期时间节点
     @RequestMapping(value = "updateConstant")

src/main/java/com/jeeplus/modules/sg/material/entity/Material.java

@@ -1,14 +1,11 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.material.entity;
+package com.jeeplus.modules.sg.audit.material.entity;
 
-import com.google.common.collect.Lists;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
-import java.util.List;
-
 /**
  * 项目信息Entity
  * @author qiuyue

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

@@ -1,12 +1,12 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.material.mapper;
+package com.jeeplus.modules.sg.audit.material.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.material.entity.Material;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.material.entity.Material;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -1,6 +1,6 @@
 <?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.material.mapper.MaterialMapper">
+<mapper namespace="com.jeeplus.modules.sg.audit.material.mapper.MaterialMapper">
 
     <sql id="materialColumns">
 		id,
@@ -24,14 +24,14 @@
 		info
 	</sql>
 
-    <select id="findByMaterialId" resultType="com.jeeplus.modules.sg.material.entity.Material">
+    <select id="findByMaterialId" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         SELECT
         <include refid="materialColumns"/>
         FROM sj_material_information
         where project_Id = #{projectId} and infor_id = #{inforId} and material_name = #{materialName}
     </select>
 
-    <update id="updateInfo" parameterType="com.jeeplus.modules.sg.material.entity.Material">
+    <update id="updateInfo" parameterType="com.jeeplus.modules.sg.audit.material.entity.Material">
 		update sj_material_information set status = #{status},info = #{info},isback = "是",isBackNo=0,afterNumber=#{afterNumber},afterAuthor=#{afterAuthor} where id = #{id};
 	</update>
     <select id="findList" resultType="Material">
@@ -73,7 +73,7 @@
     <select id="get" resultType="Material">
 		select id,status,info from sj_material_information where id = #{id}
 	</select>
-    <select id="projectNeed" resultType="com.jeeplus.modules.sg.material.entity.Material">
+    <select id="projectNeed" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         select project_id  from sj_material_information where project_id
         in(
             <foreach collection="list" index="index" item="material" separator=",">
@@ -214,14 +214,14 @@
 			del_flag = #{delFlag}
 	</insert>
 
-<select id="findByProIn" resultType="com.jeeplus.modules.sg.material.entity.Material">
+<select id="findByProIn" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         SELECT
         <include refid="materialColumns"/>
         FROM sj_material_information
         where project_Id = #{projectId} and infor_id = #{inforId}
     </select>
 
-    <select id="findInformation"  resultType="com.jeeplus.modules.sg.material.entity.Material">
+    <select id="findInformation"  resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         select project_id,SUM(isBackNo) as isBackNo
         from sj_material_information
         where project_id
@@ -233,11 +233,11 @@
         GROUP BY project_id
     </select>
 
-    <select id="findNeedInfor" resultType="com.jeeplus.modules.sg.information.entity.Information">
+    <select id="findNeedInfor" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
         select * from sj_project_information where project_id = #{projectId}
     </select>
 
-    <update id="updateNeed" parameterType="com.jeeplus.modules.sg.information.entity.Information">
+    <update id="updateNeed" parameterType="com.jeeplus.modules.sg.audit.information.entity.Information">
         update sj_project_information
         <trim prefix="set" suffixOverrides=",">
                 secondFinishDate=#{secondFinishDate},
@@ -254,7 +254,7 @@
         where project_id=#{projectId}
     </update>
 
-    <update id="updateStatus" parameterType="com.jeeplus.modules.sg.material.entity.Material">
+    <update id="updateStatus" parameterType="com.jeeplus.modules.sg.audit.material.entity.Material">
         <foreach collection="list" item="item" index="index" separator=";">
         update sj_material_information
             <trim prefix="set" suffixOverrides=",">
@@ -281,7 +281,7 @@
         </foreach>
     </update>
 
-    <select id="findIsBack" resultType="com.jeeplus.modules.sg.material.entity.Material">
+    <select id="findIsBack" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         SELECT project_id from sj_material_information where project_id in(
         <foreach collection="list" item="item" separator=",">
             #{item.projectId}
@@ -290,7 +290,7 @@
         GROUP BY project_id HAVING SUM(isBackNo) = 0
     </select>
     
-    <select id="findProId" resultType="com.jeeplus.modules.sg.material.entity.Material">
+    <select id="findProId" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         SELECT project_id from sj_material_information where (status is not null or status != '')
          and project_id in(
          <foreach collection="list" item="item" separator=",">
@@ -300,7 +300,7 @@
          GROUP BY project_id
     </select>
     
-    <select id="proIdName" resultType="com.jeeplus.modules.sg.information.entity.Information">
+    <select id="proIdName" resultType="com.jeeplus.modules.sg.audit.information.entity.Information">
         select project_id,project_name from sj_project_information where project_id in
         (
             <foreach collection="list" item="item" separator=",">
@@ -309,7 +309,7 @@
         )
     </select>
     
-    <select id="findMateial" resultType="com.jeeplus.modules.sg.material.entity.Material">
+    <select id="findMateial" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         select infor_id,material_name,outbound_number,authorized_number,status,afterNumber,afterAuthor
         from sj_material_information
         where (status is not null
@@ -318,7 +318,7 @@
     </select>
     
     
-    <select id="findStatus" resultType="com.jeeplus.modules.sg.material.entity.Material">
+    <select id="findStatus" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         select * from sj_material_information where status is not null
     </select>
 
@@ -326,7 +326,7 @@
         select isBack from sj_material_information where id = #{id};
     </select>
 
-    <select id="idFormId" resultType="com.jeeplus.modules.sg.material.entity.Material">
+    <select id="idFormId" resultType="com.jeeplus.modules.sg.audit.material.entity.Material">
         select * from sj_material_information where id =#{id};
     </select>
 </mapper>

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

@@ -1,13 +1,13 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.material.service;
+package com.jeeplus.modules.sg.audit.material.service;
 
 import java.util.List;
 
-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.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.material.entity.Material;
+import com.jeeplus.modules.sg.audit.material.mapper.MaterialMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,7 +1,7 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.material.web;
+package com.jeeplus.modules.sg.audit.material.web;
 
 import java.util.Date;
 import java.util.Map;
@@ -12,10 +12,10 @@ import javax.servlet.http.HttpServletResponse;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
-//import com.jeeplus.modules.sg.information.entity.Information;
-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 com.jeeplus.modules.sg.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.material.entity.Material;
+import com.jeeplus.modules.sg.audit.material.service.MaterialService;
 //import org.apache.shiro.authz.annotation.Logical;
 //import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +60,7 @@ public class MaterialController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(Material material, Model model) {
 		model.addAttribute("materialList", material);
-		return "modules/sg/material/materialList";
+		return "modules/sg/audit/material/materialList";
 	}
 
 
@@ -74,10 +74,13 @@ public class MaterialController extends BaseController {
 		return getBootstrapData(page);
 	}
 
+	/**
+	 * 物料原因类型及备注说明修改页面
+	 * */
 	@RequestMapping(value = "form")
 	public String form(Material material, Model model) {
 		model.addAttribute("Material", material);
-		return "modules/sg/material/materialForm";
+		return "modules/sg/audit/material/materialForm";
 	}
 
 
@@ -132,7 +135,7 @@ public class MaterialController extends BaseController {
 /*
 	*/
 /**
-	 * 导出excel文件
+	 * 导出物料信息excel文件
 	 */
 
 	@ResponseBody

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

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.record.entity;
+package com.jeeplus.modules.sg.audit.record.entity;
 
 import com.jeeplus.core.persistence.DataEntity;
 

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

@@ -0,0 +1,18 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.audit.record.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.audit.record.entity.Record;
+
+/**
+ * 项目管理MAPPER接口
+ * @author
+ * @version
+ */
+@MyBatisMapper
+public interface RecordMapper extends BaseMapper<Record> {
+
+}

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

@@ -1,6 +1,6 @@
 <?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">
+<mapper namespace="com.jeeplus.modules.sg.audit.record.mapper.RecordMapper">
 
     <sql id="recordColumns">
 		a.id,

src/main/java/com/jeeplus/modules/sg/record/service/RecordService.java

@@ -1,15 +1,12 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.record.service;
+package com.jeeplus.modules.sg.audit.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 com.jeeplus.modules.sg.audit.record.entity.Record;
+import com.jeeplus.modules.sg.audit.record.mapper.RecordMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,17 +1,17 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.record.web;
+package com.jeeplus.modules.sg.audit.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 com.jeeplus.modules.sg.audit.information.entity.Information;
+import com.jeeplus.modules.sg.audit.information.service.InformationService;
+//import com.jeeplus.modules.sg.audit.material.entity.Material;
+//import com.jeeplus.modules.sg.audit.material.service.MaterialService;
+import com.jeeplus.modules.sg.audit.record.entity.Record;
+import com.jeeplus.modules.sg.audit.record.service.RecordService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -58,7 +58,7 @@ public class RecordController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(Record record, Model model) {
 		model.addAttribute("recordList", record);
-		return "modules/sg/record/recordList";
+		return "modules/sg/audit/record/recordList";
 	}
 
 		/**

src/main/java/com/jeeplus/modules/sg/report/entity/SgReport.java

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.report.entity;
+package com.jeeplus.modules.sg.audit.report.entity;
 
 import com.jeeplus.core.persistence.DataEntity;
 

src/main/java/com/jeeplus/modules/sg/report/mapper/ReportMapper.java

@@ -1,14 +1,11 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.sg.report.mapper;
+package com.jeeplus.modules.sg.audit.report.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.material.entity.Material;
-import com.jeeplus.modules.sg.report.entity.SgReport;
-import org.apache.ibatis.annotations.Param;
+import com.jeeplus.modules.sg.audit.report.entity.SgReport;
 
 import java.util.List;
 

src/main/java/com/jeeplus/modules/sg/report/mapper/xml/ReportMapper.xml

@@ -1,6 +1,6 @@
 <?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.report.mapper.ReportMapper">
+<mapper namespace="com.jeeplus.modules.sg.audit.report.mapper.ReportMapper">
 
 	<select id="findData" resultType="SgReport" parameterType="SgReport">
 		SELECT a.department as name ,

src/main/java/com/jeeplus/modules/sg/report/service/ReportService.java

@@ -1,15 +1,11 @@
-package com.jeeplus.modules.sg.report.service;
+package com.jeeplus.modules.sg.audit.report.service;
 
 import com.jeeplus.core.service.CrudService;
-import com.jeeplus.modules.sg.information.entity.Information;
-import com.jeeplus.modules.sg.report.entity.SgReport;
-import com.jeeplus.modules.sg.report.mapper.ReportMapper;
+import com.jeeplus.modules.sg.audit.report.entity.SgReport;
+import com.jeeplus.modules.sg.audit.report.mapper.ReportMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 
 @Service

src/main/java/com/jeeplus/modules/sg/report/web/ReportController.java

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.report.web;
+package com.jeeplus.modules.sg.audit.report.web;
 
 import com.github.abel533.echarts.axis.*;
 import com.github.abel533.echarts.code.Magic;
@@ -8,11 +8,8 @@ import com.github.abel533.echarts.feature.MagicType;
 import com.github.abel533.echarts.json.GsonOption;
 import com.github.abel533.echarts.series.Bar;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.core.persistence.Page;
-import com.jeeplus.modules.sg.report.entity.SgReport;
-import com.jeeplus.modules.sg.report.service.ReportService;
-import com.jeeplus.modules.test.manytomany.entity.StudentCourse;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import com.jeeplus.modules.sg.audit.report.entity.SgReport;
+import com.jeeplus.modules.sg.audit.report.service.ReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -48,7 +45,7 @@ public class ReportController {
         }else {
             model.addAttribute("dataURL", "/sg/report/option");
         }
-        return "modules/sg/report/reportList";
+        return "modules/sg/audit/report/reportList";
     }
 
     /**
@@ -67,7 +64,7 @@ public class ReportController {
         }else {
             model.addAttribute("dataURL", "/sg/report/unitoption");
         }
-        return "modules/sg/report/reportList1";
+        return "modules/sg/audit/report/reportList1";
     }
 
 

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

@@ -1,25 +0,0 @@
-/**
- * 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/resources/spring/spring-context-shiro.xml

@@ -85,7 +85,7 @@
 		<property name="sessionListeners" ref="sessionListener1"/>
 	</bean>
 
-	<bean id="sessionListener1" class="com.jeeplus.modules.sg.information.utils.SessionListener1"></bean>
+	<bean id="sessionListener1" class="com.jeeplus.modules.sg.audit.information.utils.SessionListener1"></bean>
 
 	<!-- 指定本系统SESSIONID, 默认为: JSESSIONID 问题: 与SERVLET容器名冲突, 如JETTY, TOMCAT 等默认JSESSIONID,
 		当跳出SHIRO SERVLET时如ERROR-PAGE容器会为JSESSIONID重新分配值导致登录会话丢失! -->