名称修改

src/main/java/com/jeeplus/modules/sg/settActivi/enntity/SettActivi.java

@@ -1,9 +1,7 @@
-package com.jeeplus.modules.sg.settActivi.enntity;
+package com.jeeplus.modules.sg.settActivi.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.persistence.ActEntity;
 
-import java.util.Date;
 /**
  * 结算流程
  * */

src/main/java/com/jeeplus/modules/sg/settActivi/enntity/SettList.java

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.sg.settActivi.enntity;
+package com.jeeplus.modules.sg.settActivi.entity;
 
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.ActEntity;

src/main/java/com/jeeplus/modules/sg/settActivi/mapper/SettActiviMapper.java

@@ -6,13 +6,10 @@ package com.jeeplus.modules.sg.settActivi.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.picking.activiti.entity.*;
-import com.jeeplus.modules.sg.settActivi.enntity.SettActivi;
-import com.jeeplus.modules.sg.settActivi.enntity.SettList;
-import org.apache.ibatis.annotations.Param;
+import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
+import com.jeeplus.modules.sg.settActivi.entity.SettList;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * 模块显示MAPPER接口

src/main/java/com/jeeplus/modules/sg/settActivi/mapper/xml/SettActiviMapper.xml

@@ -138,7 +138,7 @@
             )
         </foreach>
     </insert>
-    <select id="findAllSett" resultType="com.jeeplus.modules.sg.settActivi.enntity.SettActivi">
+    <select id="findAllSett" resultType="com.jeeplus.modules.sg.settActivi.entity.SettActivi">
         select a.id,a.projectId,a.requireName,a.proc_ins_id,b.construction_unit_manage from xm_settlement_process a
         left join xm_project_details b
         on a.projectId = b.project_id
@@ -173,7 +173,7 @@
         where id = #{id};
     </select>
 
-    <select id="findUseQuantityData" resultType="com.jeeplus.modules.sg.settActivi.enntity.SettList">
+    <select id="findUseQuantityData" resultType="com.jeeplus.modules.sg.settActivi.entity.SettList">
         select id,
                projectId,
                requireName,
@@ -210,7 +210,7 @@
         where id = #{id};
     </update>
 
-    <select id="exportFind" resultType="com.jeeplus.modules.sg.settActivi.enntity.SettActivi">
+    <select id="exportFind" resultType="com.jeeplus.modules.sg.settActivi.entity.SettActivi">
         select a.requireName, b.project_id, b.construction_unit_manage
         from xm_settlement_process a
                  left join xm_project_details b

src/main/java/com/jeeplus/modules/sg/settActivi/service/SettActiviService.java

@@ -3,25 +3,16 @@
  */
 package com.jeeplus.modules.sg.settActivi.service;
 
-import com.jeeplus.common.config.Global;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
-import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.picking.activiti.entity.*;
-import com.jeeplus.modules.sg.picking.activiti.mapper.PickIngMapper;
-import com.jeeplus.modules.sg.settActivi.enntity.SettActivi;
-import com.jeeplus.modules.sg.settActivi.enntity.SettList;
+import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
+import com.jeeplus.modules.sg.settActivi.entity.SettList;
 import com.jeeplus.modules.sg.settActivi.mapper.SettActiviMapper;
-import com.jeeplus.modules.sys.entity.DictValue;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 
 /**

src/main/java/com/jeeplus/modules/sg/settActivi/web/SettActiviController.java

@@ -1,7 +1,6 @@
 package com.jeeplus.modules.sg.settActivi.web;
 
 import com.google.common.collect.Maps;
-import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
@@ -9,49 +8,29 @@ import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActProcessService;
 import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.sg.audit.information.entity.Information;
 import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
-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.managementcenter.activiti.service.ConstructionService;
-import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
-import com.jeeplus.modules.sg.managementcenter.materialInventory.entity.MaterialInventory;
-import com.jeeplus.modules.sg.managementcenter.materialProvided.entity.MaterialProvided;
-import com.jeeplus.modules.sg.managementcenter.materialProvided.service.MaterialProvidedService;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
-import com.jeeplus.modules.sg.managementcenter.project.util.ImportUtil;
-import com.jeeplus.modules.sg.picking.activiti.entity.*;
-import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
-import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
-import com.jeeplus.modules.sg.settActivi.enntity.SettActivi;
-import com.jeeplus.modules.sg.settActivi.enntity.SettList;
+import com.jeeplus.modules.sg.settActivi.entity.SettActivi;
+import com.jeeplus.modules.sg.settActivi.entity.SettList;
 import com.jeeplus.modules.sg.settActivi.service.SettActiviService;
-import com.jeeplus.modules.sys.entity.DictValue;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.apache.poi.ss.usermodel.Row;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.*;
-import java.math.BigDecimal;
-import java.net.URLDecoder;
 import java.util.*;
 
 @Controller