FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-08-01 11:06:27 +08:00
parent 18e8cca200 2541c05176
commit 0b211ffcd1
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+2 -16
View File
@@ -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");
SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
String issueStr = "";
try {
issueStr = format2.format(format.parse(sarStandardsInfoEO.getIssueTime()));
}catch (Exception e){
}
map.put("issueTime",issueStr);
map.put("issueTime",sarStandardsInfoEO.getPutTime());
}else{
map.put("issueTime", "");
}
if (sarStandardsInfoEO.getPutTime() != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
String issueStr = "";
try {
issueStr = format2.format(format.parse(sarStandardsInfoEO.getPutTime()));
}catch (Exception e){
}
map.put("putTime",issueStr);
map.put("putTime",sarStandardsInfoEO.getPutTime());
}else {
map.put("putTime", "");
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
+8
View File
@@ -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){