Merge remote-tracking branch 'origin/master'

mjava-lanyun/src/main/java/com/malk/lanyun/controller/TimerController.java

@@ -169,4 +169,15 @@ public class TimerController {
         log.info("开始查找项目编号所有项目点是否补充");
         return timerService.testSelectIsSupply(request);
     }
+
+    /**
+     * 单个修改各项目点月度经营分析
+     * @param
+     * @return
+     */
+    @PostMapping("updateAnalysis")
+    public void updateAnalysis(@RequestBody Map<String,Object> data){
+        log.info("开始修改单个各项目点月度经营分析");
+        timerService.updateAnalysis(data);
+    }
 }

mjava-lanyun/src/main/java/com/malk/lanyun/service/TimerService.java

@@ -96,4 +96,5 @@ public interface TimerService {
 
     boolean testSelectIsSupply(HttpServletRequest request);
 
+    void updateAnalysis(Map<String,Object> data);
 }

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/TimerServiceImpl.java

@@ -862,6 +862,7 @@ public class TimerServiceImpl implements TimerService {
                 .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
                 .formUuid("FORM-97BA6C6C8C50416A9E5854F2F4B5C3F3R4WC")
                 .build());
+        final int[] sum = {0};
         allProjectList.forEach(e->{
             System.out.println(e.toString());
             int status = 1;
@@ -872,15 +873,18 @@ public class TimerServiceImpl implements TimerService {
                     if (e.get("textField_ltxrn8h1").equals(noNeedResult.get(i).get("code"))){
                         status = 0;
                         break;
+                    }else {
+                        sum[0]++;
                     }
                 }
             }
-            ydClient.operateData(YDParam.builder()
-                    .appType("APP_ERBDTFS82HOVBPL3NFH0")
-                    .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
-                    .formInstanceId(e.get("formInstanceId").toString())
-                    .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_m230rjg5",status)))
-                    .build(), YDConf.FORM_OPERATION.update);
+            System.out.println(sum[0]);
+//            ydClient.operateData(YDParam.builder()
+//                    .appType("APP_ERBDTFS82HOVBPL3NFH0")
+//                    .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
+//                    .formInstanceId(e.get("formInstanceId").toString())
+//                    .updateFormDataJson(JSON.toJSONString(UtilMap.map("numberField_m230rjg5",status)))
+//                    .build(), YDConf.FORM_OPERATION.update);
         });
     }
 
@@ -1012,4 +1016,33 @@ public class TimerServiceImpl implements TimerService {
     public boolean testSelectIsSupply(HttpServletRequest request) {
         return false;
     }
+
+    @Override
+    public void updateAnalysis(Map<String,Object> map) {
+        YDParam ydParam = YDParam.builder()
+                .formInstId(map.get("formInstId").toString())
+                .build();
+        Map data = ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_id).getFormData();
+        log.info("修改数据:{}",data);
+        try {
+            Class.forName(driver);
+            Connection connection = DriverManager.getConnection(url, username, password);
+            String updateSql = "UPDATE `lanyun_project_analysis` SET  `belong_project` = '"+ data.get("textField_bheotm5")+"', " +
+                    " `status` = '"+ data.get("textField_pa6o780")+"', `predict_income` = '"+ data.get("numberField_5wyyb42")+"', `open` = '"+ data.get("numberField_c4acnrg")+"', " +
+                    "`income` = '"+ data.get("numberField_zjdki9k")+"', `person` = '"+ data.get("numberField_hg6jznm")+"', `person_cost` = '"+ data.get("numberField_7ga9c5w")+"', " +
+                    "`material` = '"+ data.get("numberField_c3cqsfv")+"', `other_cost` = '"+ data.get("numberField_avaexyf")+"', " +
+                    "`cost_sum` = '"+ data.get("numberField_gub2ul5")+"', `taxes` = '"+ data.get("numberField_hqiac12")+"', `gross_profit` = '"+ data.get("numberField_lz6mt3xq")+"', " +
+                    "`gross_margin` = '"+ data.get("numberField_lz9n3fm9")+"', " +
+                    "`overhead` = '"+ data.get("numberField_ln701sy")+"', `corporate_income_tax` = '"+ data.get("numberField_fmhzxdr")+"', " +
+                    "`net_profit` = '"+ data.get("numberField_lz6mt3xr")+"', `net_margin` = '"+ data.get("numberField_lz9n3fma")+"', " +
+                    "`format` = '"+ data.get("textField_tpb3m2f")+"', `customer_system` = '"+ data.get("textField_2adicsn")+"', `profit_loss` = '"+ data.get("textField_1yw4mx4")+"', " +
+                    "`approach_date` = '"+ data.get("dateField_ji5yfvf")+"', " +
+                    "`level` = '"+ data.get("textField_h2qx5nz")+"', `notes` = '"+ data.get("textField_35paoph")+"'" +
+                    " WHERE `project_name` = '"+ data.get("textField_dliiyul")+"' AND `month` = "+data.get("dateField_lcwv382")+";\n";
+            PreparedStatement ps = connection.prepareStatement(updateSql);
+            ps.executeUpdate();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }