Merge branch 'master' of http://47.100.37.243:10080/wutt/lsappBms

pcbms/src/main/java/com/hssx/pcbms/controller/IdeaController.java

@@ -94,8 +94,8 @@ public class IdeaController {
     @ApiOperation(value = "打分根据年月去获取他的建议列表", notes = "打分根据年月去获取他的建议列表方法")
     @RequestMapping("/ideaListByTime")
     @ResponseBody
-    public HttpRespMsg ideaListByTime(Idea idea,String time,String scoreId) {
-        HttpRespMsg msg = ideaService.ideaListByTime(idea,time,scoreId);
+    public HttpRespMsg ideaListByTime(Idea idea,String time,String sId) {
+        HttpRespMsg msg = ideaService.ideaListByTime(idea,time,sId);
         return msg;
     }
 

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsServiceImpl.java

@@ -494,7 +494,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             //型号
             rowList.add(dynamic.getModelNumber());
             //数量
-            rowList.add(dynamic.getGoodsNos().size()+"");
+            rowList.add(dynamic.getGoodsNosVO().size()+"");
             //单位
             rowList.add(dynamic.getUnit());
             //生产厂家
@@ -550,5 +550,12 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 //        System.out.println(Integer.parseInt("0001"));
         List<Integer> list = new ArrayList<>();
         System.out.println(list.stream().map(a ->a).collect(Collectors.toList()));
+        String proId = "1111111";
+        String sql = "select DESCS DESCS3 ADUITDATE ADUITDATE3 from t_pilot_flowaduit where proid='"+proId+"' and processinstanceid =(select processinstanceid from t_dtjms_start_report  where pro_id='"+proId+"')  and workitemname='开工报告建设审核'";
+        sql = "select DESCS DESCS2,ADUITDATE ADUITDATE2 from t_pilot_flowaduit where proid='"+proId+"' and processinstanceid =(select processinstanceid from t_dtjms_start_command  where pro_id='"+proId+"') and workitemname='建设负责人审核'";        System.out.println(sql);
+        sql = "select UPLOAD_PATH from t_dtjms_upload_document where gx_id in("
+                +"select gx_id from t_dtjms_build_log where pro_id='"
+                +proId+"') and type=30 and Upload_Time >= '"+15+" 00:00:00"+"' and UploadTime <='"+15+" 23:59:59"+"'";
+        System.out.println(sql);
     }
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/IdeaServiceImpl.java

@@ -82,16 +82,16 @@ public class IdeaServiceImpl extends ServiceImpl<IdeaMapper, Idea> implements Id
     }
 
     @Override
-    public HttpRespMsg ideaListByTime(Idea idea, String time, String scoreId) {
+    public HttpRespMsg ideaListByTime(Idea idea, String time, String sId) {
         HttpRespMsg msg = new HttpRespMsg();
         List<IdeaVO> list = ideaMapper.getIdeaListByUid(idea, time);
-        Score score = scoreMapper.selectOne(new QueryWrapper<Score>().eq("score_id", scoreId));
+        Score score = scoreMapper.selectOne(new QueryWrapper<Score>().eq("score_id", sId));
         double sum = 0.0;
         if (list.size() > 0) {
             sum = list.stream().mapToDouble(IdeaVO::getScore).sum();
         }
         score.setTotal(score.getPersonalScore() + sum);
-        scoreMapper.update(score, new QueryWrapper<Score>().eq("score_id", scoreId));
+        scoreMapper.update(score, new QueryWrapper<Score>().eq("score_id", sId));
         msg.data = list;
         return msg;
     }

pcbms/src/main/resources/application-prod.properties

@@ -19,6 +19,9 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://118.190.47.230:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
+#spring.datasource.url=jdbc:mysql://10.214.111.235:3306/lishui_app?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#spring.datasource.username=appuser
+#spring.datasource.password=appuser
 #spring.datasource.druid.test-on-borrow=true
 #spring.datasource.druid.test-while-idle=true
 # ####################################################################################################
@@ -39,7 +42,7 @@ spring.thymeleaf.prefix=classpath:/static/
 #spring.redis.port=6379
 ######################################################################################################
 # ÎļþÉÏ´«Â·¾¶
-upload.path=E:/staticproject/lsbms/upload/
+upload.path=/center/nginx/staticproject/lsbms/upload/
 # ±¸ÓÃÃÜÂë
 sysPwd=lsbms
 ######################################################################################################