1.停复役修改

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

@@ -317,7 +317,7 @@ public class TMaintenanceController extends BaseRESTfulController {
     }
     @PutMapping(value = "/pusAlla")
     public RESTfulResult pusAlla(@RequestBody TMaintenance[]params) {
-        String datetime = DateUtils.getCurrentTime("yyyy-MM-dd");
+        String datetime = DateUtils.getCurrentTime("yyyy-MM-dd HH:mm:ss");
         for (int i = 0; i <params.length ; i++) {
             String Declareid= params[i].getDeclareid();
             String Billstatus= params[i].getBillstatus();

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

@@ -163,16 +163,14 @@ public class TSubmittedController extends BaseRESTfulController {
         String mouth = Signtime.substring(5, 7);
         Integer maxid = tSubmittedService.MaxID(mouth);
         model.setMaxid(new BigDecimal(maxid));
-        String id = model.getDeclareid() + maxid;
-        model.setConstruid(id);
-        String datetime = DateUtils.getCurrentTime("yyyy-MM-dd");
 
+        String datetime = DateUtils.getCurrentTime("yyyy-MM-dd");
         if (model == null) {
             return failed(null, "参数错误！");
         }
         TSubmitted tSubmitted = new TSubmitted();
         String bid = model.getConstruid();
-        model.setDeclareid(model.getDeclareid()+ "_"+ String.format("%04d", maxid));
+        model.setConstruid(model.getDeclareid()+ "_"+ String.format("%04d", maxid));
         tSubmitted= tSubmittedService.add(model);
         String filesid = "";
         if (file!=null){

src/main/java/com/steerinfo/ems/tsubmitted/model/TSubmitted.java

@@ -116,7 +116,7 @@ public class TSubmitted implements IBasePO<String> {
         this.construid = construid == null ? null : construid.trim();
     }
     public String getState() {
-        return construid;
+        return state;
     }
     public void setState(String state) {
         this.state = state == null ? null : state.trim();