1停复役修改

src/main/java/com/steerinfo/ems/tmaintenance/controller/TMaintenanceController.java

@@ -176,6 +176,16 @@ public class TMaintenanceController extends BaseRESTfulController {
         }
         TMaintenance tMaintenance = new TMaintenance();
         String bid = model.getDeclareid();
+        String filenames=tMaintenanceService.selectfilename(bid);
+        if (filenames==null){
+            filenames = "";
+        }
+        String filenamesa = "";
+        for (int i = 0; i < file.length; i++) {
+            filenamesa+=file[i].getOriginalFilename()+";";
+        }
+        String newfilename = filenames+";"+filenamesa;
+        model.setFilename(newfilename);
         model.setChargetime(datetime);
         tMaintenanceService.modify(model);
         String filesid = "";
@@ -252,6 +262,31 @@ public class TMaintenanceController extends BaseRESTfulController {
         if (model == null) {
             return failed(null, "参数错误！");
         }
+        String ids= "";
+        if(model.getApplayer()=="烧结"||"烧结".equals(model.getApplayer())){
+            ids = "SJ_";
+        }
+        if(model.getApplayer()=="炼钢"||"炼钢".equals(model.getApplayer())){
+            ids = "LG_";
+        }
+        if(model.getApplayer()=="建材"||"建材".equals(model.getApplayer())){
+            ids = "JC_";
+        }
+        if(model.getApplayer()=="电厂"||"电厂".equals(model.getApplayer())){
+            ids = "DC_";
+        }
+        if(model.getApplayer()=="高炉"||"高炉".equals(model.getApplayer())){
+            ids = "GL_";
+        }
+        if(model.getApplayer()=="机焦"||"机焦".equals(model.getApplayer())){
+            ids = "JJ_";
+        }
+        if(model.getApplayer()=="高线"||"高线".equals(model.getApplayer())){
+            ids = "GX_";
+        }
+        if(model.getApplayer()=="型钢"||"型钢".equals(model.getApplayer())){
+            ids = "XG_";
+        }
         TMaintenance tMaintenance = new TMaintenance();
         //丛前端获取申报日期，利用SimpleDateFormat类转换为字符串
         String declaretime = model.getDeclaretime();
@@ -262,7 +297,12 @@ public class TMaintenanceController extends BaseRESTfulController {
         String updatetime = DateUtils.getCurrentTime("yyyy-MM-dd HH:mm:ss");
         model.setChargetime(updatetime);
         String bid = model.getDeclareid();
-        model.setDeclareid(model.getDeclareid()+DateUtils.getCurrentTime("yyyyMMdd") + "_"+ String.format("%04d", maxid));
+        model.setDeclareid(ids+DateUtils.getCurrentTime("yyyyMMdd") + "_"+ String.format("%04d", maxid));
+        String filenames ="";
+        for (int i = 0; i <file.length ; i++) {
+            filenames+=file[i].getOriginalFilename()+";";
+        }
+        model.setFilename(filenames);
         tMaintenance = tMaintenanceService.add(model);
         String filesid = "";
         if (file!=null){
@@ -299,6 +339,7 @@ public class TMaintenanceController extends BaseRESTfulController {
                 }
             }
             return success(filesid);
+
             }
         return success(tMaintenance);
     }
@@ -337,11 +378,16 @@ public class TMaintenanceController extends BaseRESTfulController {
     public RESTfulResult upstate(@RequestParam HashMap<String,String> tSubmitted){
         TMaintenance tMaintenance = new TMaintenance();
        String declareid= tSubmitted.get("declareid");
-       String state = tSubmitted.get("state");
-        tMaintenance.setDeclareid(declareid);
-        tMaintenance.setBillstatus(state);
-        Integer count = tMaintenanceService.upstate(tMaintenance);
-        return success(count);
+        String state = tSubmitted.get("state");
+
+       if (state==null||"".equals(state)){
+           return failed(null,"状态不能为空");
+       }else {
+           tMaintenance.setDeclareid(declareid);
+           tMaintenance.setBillstatus(state);
+           Integer count = tMaintenanceService.upstate(tMaintenance);
+           return success(count);
+       }
     }
     //下载附件
     @RequestMapping(value = "/downloadFile")

src/main/java/com/steerinfo/ems/tmaintenance/mapper/TMaintenanceMapper.java

@@ -22,4 +22,5 @@ public interface TMaintenanceMapper extends IBaseMapper<TMaintenance, String> {
     List<TMaintenance> selectLikes(Map<String, Object> parameters);
     List<TMaintenance> approval(Map<String, Object> parameters);
     Integer updatecheck(@Param(value = "declareid")String ids);
+    String selectfilename(String filname);
 }

src/main/java/com/steerinfo/ems/tmaintenance/mapper/TMaintenanceMapper.xml

@@ -896,4 +896,22 @@
       #{declareid,jdbcType=VARCHAR} and RECORD>0
     </where>
   </update>
+  <select id="selectfilename" parameterType = "string" resultType="string">
+    SELECT
+      listagg (filename, ',')within group ( ORDER BY filename)
+    FROM
+      (
+      SELECT
+      distinct
+      t.DECLAREID,
+      t1.filename,
+      t1.id
+      FROM
+      T_MAINTENANCE t
+      LEFT JOIN T_MAINTENANCE_FILE t1 ON t.declareid = t1.id
+      WHERE
+      t.record > 0 and t.declareid =#{declareid,jdbcType=VARCHAR}
+      )
+    GROUP BY id
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/tmaintenance/service/ITMaintenanceService.java

@@ -35,4 +35,5 @@ public interface ITMaintenanceService extends IBaseService<TMaintenance, String>
     PageList<TMaintenance> listLikeapprovals(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
     PageList<TMaintenance> approval(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
     Integer upstate (TMaintenance t);
+    String selectfilename(String filname);
 }

src/main/java/com/steerinfo/ems/tmaintenance/service/impl/TMaintenanceServiceImpl.java

@@ -116,6 +116,13 @@ public class TMaintenanceServiceImpl extends BaseServiceImpl<TMaintenance, Strin
         int count = tMaintenanceMapper.updateByPrimaryKeySelective(t);
         return count;
     }
+
+    @Override
+    public String selectfilename(String filname) {
+        String filenames=tMaintenanceMapper.selectfilename(filname);
+        return filenames;
+    }
+
     @Override
     public Integer updatecheck(String ids) {
         if ("".equals(ids) || ids == null) {

src/main/java/com/steerinfo/ems/tprocessinfor/controller/TProcessinforController.java

@@ -122,8 +122,8 @@ public class TProcessinforController extends BaseRESTfulController {
     }
     //获取下拉框
     @GetMapping("/getmeuns")
-    public RESTfulResult getMeuns(@RequestParam String node){
-        List<TProcessinfor> menus = tProcessinforService.getMenus(node);
+    public RESTfulResult getMeuns(@RequestParam String node,String name){
+        List<TProcessinfor> menus = tProcessinforService.getMenus(node,name);
         return success(menus);
     }
 

src/main/java/com/steerinfo/ems/tprocessinfor/mapper/TProcessinforMapper.java

@@ -17,5 +17,5 @@ public interface TProcessinforMapper extends IBaseMapper<TProcessinfor, String>
     List<TProcessinfor> getParent();
     Integer getMaxSeqNo();
     List<TProcessinforMapper> getIdAndName(Map<String, Object> parameters);
-    List<TProcessinfor> getMenus(String node);
+    List<TProcessinfor> getMenus(String node,String name);
 }

src/main/java/com/steerinfo/ems/tprocessinfor/mapper/TProcessinforMapper.xml

@@ -260,7 +260,7 @@
 
   <select id="getMenus" resultMap="BaseResultMap">
     select ID, NAME, NODE from T_PROCESSINFOR
-    where NODE = #{node,jdbcType=VARCHAR}
+    where NODE = #{node,jdbcType=VARCHAR} and NAME LIKE '%${name}%'
     order by SEQNO
   </select>
 </mapper>

src/main/java/com/steerinfo/ems/tprocessinfor/service/ITProcessinforService.java

@@ -29,5 +29,5 @@ public interface ITProcessinforService extends IBaseService<TProcessinfor, Strin
     Integer getMaxSeqNo();
     List<TProcessinforMapper> getIdAndName(Map<String, Object> parameters);
 
-    List<TProcessinfor> getMenus(String node);
+    List<TProcessinfor> getMenus(String node,String name);
 }

src/main/java/com/steerinfo/ems/tprocessinfor/service/impl/TProcessinforServiceImpl.java

@@ -56,9 +56,9 @@ public class TProcessinforServiceImpl extends BaseServiceImpl<TProcessinfor, Str
     }
 
     @Override
-    public List<TProcessinfor> getMenus(String node) {
+    public List<TProcessinfor> getMenus(String node,String name) {
 
-        return tProcessinforMapper.getMenus(node);
+        return tProcessinforMapper.getMenus(node,name);
     }
 
 

src/main/java/com/steerinfo/ems/tsubmitted/controller/TSubmittedController.java

@@ -154,6 +154,14 @@ public class TSubmittedController extends BaseRESTfulController {
 
     @PostMapping(value = "/pus/")
     public RESTfulResult putMes(@ModelAttribute MultipartFile[] file, TSubmitted model, String del) {
+        if (model.getSigntime()==null||"".equals(model.getSigntime())){
+             return failed(null,"日期不能为空");
+        }
+        if (model.getState()==null||"".equals(model.getState())){
+            return failed(null,"状态不能为空");
+        } if (model.getConstrucontent()==null||"".equals(model.getConstrucontent())){
+            return failed(null,"内容不能为空");
+        }
         HashMap hashMap = new HashMap();
         hashMap.put("declareid",model.getDeclareid());
         //丛前端获取申报日期，利用SimpleDateFormat类转换为字符串
@@ -171,6 +179,11 @@ public class TSubmittedController extends BaseRESTfulController {
         TSubmitted tSubmitted = new TSubmitted();
         String bid = model.getConstruid();
         model.setConstruid(model.getDeclareid()+ "_"+ String.format("%04d", maxid));
+        String filenames ="";
+        for (int i = 0; i <file.length ; i++) {
+            filenames+=file[i].getOriginalFilename()+";";
+        }
+        model.setConstrufile(filenames);
         tSubmitted= tSubmittedService.add(model);
         String filesid = "";
         if (file!=null){