|
|
@@ -641,6 +641,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
t.setId(b.getTid());
|
|
|
t.setProjectStatus(b.getProjectStatus());
|
|
|
t.setTimeRecord(b.getTimeRecord());
|
|
|
+ String date =updateProjectCompleteDate(b.getTimeRecord());
|
|
|
+ t.setCompleteDate(DateUtils.parseDate(date));
|
|
|
t.setCertificateNumber(b.getCertificateNumber());
|
|
|
if(b.getSetUpAmount()!=null)t.setSetUpAmount(new BigDecimal(b.getSetUpAmount()));
|
|
|
if (b.getPubicityUrl()!=null)t.setPubicityUrl(b.getPubicityUrl());
|
|
|
@@ -2069,37 +2071,50 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
public void pushProjectCompleteDate() {
|
|
|
List<TOrderTask> tOrderTasks = tOrderTaskMapper.selectAll();
|
|
|
for (TOrderTask e : tOrderTasks) {
|
|
|
- if (StringUtils.isNotEmpty(e.getTimeRecord())){
|
|
|
- ObjectMapper mapper = new ObjectMapper();
|
|
|
- try {
|
|
|
- Map map = mapper.readValue(e.getTimeRecord(), Map.class);
|
|
|
- //高新 10已下证 科技 18立项已拨款 专利/软著 19已完成/下证 会员 27全部完成
|
|
|
- Map map2 = (Map) map.get("10");
|
|
|
- Integer x=10;
|
|
|
- String date = (String) map2.get("date");
|
|
|
- if (date==null){
|
|
|
- map2 = (Map) map.get("18");
|
|
|
- date = (String) map2.get("date");
|
|
|
- x=18;
|
|
|
- }
|
|
|
- if (date==null) {
|
|
|
- map2 = (Map) map.get("19");
|
|
|
- date = (String) map2.get("date");
|
|
|
- x=19;
|
|
|
- }
|
|
|
- if (date==null){
|
|
|
- map2 = (Map) map.get("27");
|
|
|
- date = (String) map2.get("date");
|
|
|
- x=27;
|
|
|
- }
|
|
|
- if(date!=null){
|
|
|
- System.out.println(e.getId()+":"+x+"="+date);
|
|
|
- }
|
|
|
- } catch (JsonProcessingException ex) {
|
|
|
- throw new RuntimeException(ex);
|
|
|
- }
|
|
|
- }
|
|
|
+ String date = updateProjectCompleteDate(e.getTimeRecord());
|
|
|
+ if (date != null) {
|
|
|
+ TOrderTask t=new TOrderTask();
|
|
|
+ t.setId(e.getId());
|
|
|
+ t.setCompleteDate(DateUtils.parseDate(date));
|
|
|
+ tOrderTaskMapper.update(t);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private String updateProjectCompleteDate(String timeRecord) {
|
|
|
+ if (StringUtils.isNotEmpty(timeRecord)) {
|
|
|
+ ObjectMapper mapper = new ObjectMapper();
|
|
|
+ try {
|
|
|
+ Map map = mapper.readValue(timeRecord, Map.class);
|
|
|
+ //高新 10已下证 科技 18立项已拨款 专利/软著 19已完成/下证 会员 27全部完成
|
|
|
+ Map map2 = (Map) map.get("10");
|
|
|
+ Integer x = 10;
|
|
|
+ String date = (String) map2.get("date");
|
|
|
+ if (date == null) {
|
|
|
+ map2 = (Map) map.get("18");
|
|
|
+ date = (String) map2.get("date");
|
|
|
+ x = 18;
|
|
|
+ }
|
|
|
+ if (date == null) {
|
|
|
+ map2 = (Map) map.get("19");
|
|
|
+ date = (String) map2.get("date");
|
|
|
+ x = 19;
|
|
|
+ }
|
|
|
+ if (date == null) {
|
|
|
+ map2 = (Map) map.get("27");
|
|
|
+ date = (String) map2.get("date");
|
|
|
+ x = 27;
|
|
|
+ }
|
|
|
+ if (date != null) {
|
|
|
+ System.out.println( x + "=" + date);
|
|
|
+ return date;
|
|
|
+ }
|
|
|
+ } catch (JsonProcessingException ex) {
|
|
|
+ throw new RuntimeException(ex);
|
|
|
+ }
|
|
|
}
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
}
|