Merge branch 'develop_master' into FOTON

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -738,26 +738,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         map.put("standNature",verifyObj(sarStandardsInfoEO.getStandNature()));
         map.put("standState",verifyObj(sarStandardsInfoEO.getStandStatus()));
         if (sarStandardsInfoEO.getIssueTime() != null) {
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            map.put("issueTime",sarStandardsInfoEO.getPutTime());
-            SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
-            String issueStr = "";
-            try {
-                issueStr = format2.format(format.parse(sarStandardsInfoEO.getIssueTime()));
-            }catch (Exception e){
-            }
-            map.put("issueTime",issueStr);
         }else{
             map.put("issueTime", "");
         }
         if (sarStandardsInfoEO.getPutTime() != null) {
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            map.put("putTime",sarStandardsInfoEO.getPutTime());
-            SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
-            String issueStr = "";
-            try {
-                issueStr = format2.format(format.parse(sarStandardsInfoEO.getPutTime()));
-            }catch (Exception e){
-            }
-            map.put("putTime",issueStr);
         }else {
             map.put("putTime", "");
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java

@@ -47,6 +47,14 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
     private SarPublicIdeaAllDao sarPublicIdeaAllDao;
 
 
+    @ApiOperation(value = "根据ID查询ID下全部意见")
+    @GetMapping("/getAllStandById")
+    public List<SarPublicIdeaAll> getAllStandById(@RequestParam("ideaId") String ideaId){
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("idea_id",ideaId);
+        return sarPublicIdeaAllDao.selectList(wrapper);
+    }
+
     @ApiOperation(value = "查询全部意见")
     @GetMapping("/getAllStand")
     public ResponseMessage getAllStand(DetAllStandDto detAllStandDto){