提交接口

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinPerformancesAdminServiceImpl.java

@@ -179,7 +179,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 
                 KylinPerformanceStatus statusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
                 KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
-                if (statusData.getStatus() == 1 && statusData.getStatus() == 4) {
+                if (statusData.getStatus() == 1 || statusData.getStatus() == 4) {
                     performanceStatus.setStatus(status);
                 }
                 performanceStatus.setAuditStatus(auditStatus);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -264,6 +264,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             // 获取第一步数据
             if (step2Param.getIsSubmit() == 1) { // 提交
                 map.put("status", 1);
+                map.put("auditStatus", 0);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
                 mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
@@ -296,6 +297,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             } else { //保存
                 map.put("status", 0);
                 map.put("isCreateSave", 1);
+                map.put("auditStatus", -1);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
                 mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateMany(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
@@ -335,6 +337,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             // 获取第一步数据
             if (step2Param.getIsSubmit() == 1) { // 提交
                 map.put("status", 1);
+                map.put("auditStatus", 0);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
                 mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
@@ -400,6 +403,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 return ResponseDto.success("操作完成");
             } else { //保存
                 map.put("status", 0);
+                map.put("auditStatus", -1);
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
                 mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateMany(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
@@ -732,12 +736,16 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 HashMap<String, Object> map = new HashMap<>();
                 if (performanceStatus.getStatus() >= 3) {//通过审核
                     data1.setAuditStatus(1);
+                    data1.setStatus(null);
                     map.put("auditStatus", 1);
-                } else if (performanceStatus.getStatus() == 4) {//未通过审核
+                } else if (performanceStatus.getStatus() == 4 || performanceStatus.getStatus() == 1) {//未通过审核
                     data1.setAuditStatus(-1);
+                    data1.setStatus(0);
                     map.put("auditStatus", -1);
+                    map.put("status", 0);
                 } else {
                     data1.setAuditStatus(2);
+                    data1.setStatus(null);
                     map.put("auditStatus", 2);
                 }
                 performanceStatusMapper.update(data1, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java

@@ -86,10 +86,15 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             LocalDateTime createdAt = LocalDateTime.now();
             // 标题
             String title = "";
+            String useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+            String useEnd = createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
             if (createTicketTimesParam.getType() == 1) {
-                title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+                if(!useStart.split(" ")[0].equals(useEnd.split(" ")[0])){
+                    return ResponseDto.failure(ErrorMapping.get(20118));
+                }
+                title = useStart;
             } else {
-                title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+                title = useStart + "-" + useEnd;
             }
             // mongo 操作
             TicketTimesPartnerVo ticketTimesPartnerVo = new TicketTimesPartnerVo();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties

@@ -27,6 +27,7 @@
 20115=提交失败
 20116=不可撤回
 20117=撤回失败
+20118=日期有误
 
 #APP JDM
 20201=
\ No newline at end of file