Commit ab639222 by kangxiaoshan

加特林合同

parent 00227a49
...@@ -786,8 +786,8 @@ public class DmpIncomeServiceImpl implements DmpIncomeService { ...@@ -786,8 +786,8 @@ public class DmpIncomeServiceImpl implements DmpIncomeService {
@Override @Override
public ResultModel attachList(String code, String startDate, String endDate, String platform) { public ResultModel attachList(String code, String startDate, String endDate, String platform) {
List<PdAttachment> attachments; List<PdAttachment> attachments;
if (StringUtils.isEmpty(startDate)) { if (!StringUtils.isEmpty(startDate)) {
attachments = pdAttachmentRepository.findBycontractCodeAndDate(code,startDate,endDate); attachments = pdAttachmentRepository.findBycontractCodeAndDate(code, startDate+" 00:00:00", endDate+" 23:59:59");
} else { } else {
attachments = pdAttachmentRepository.findBycontractCode(code); attachments = pdAttachmentRepository.findBycontractCode(code);
} }
......
...@@ -22,6 +22,7 @@ public class ContractBranchUtil { ...@@ -22,6 +22,7 @@ public class ContractBranchUtil {
map.put("abtest", "type_one"); map.put("abtest", "type_one");
map.put("tkio", "type_two"); map.put("tkio", "type_two");
map.put("cas", "type_three"); map.put("cas", "type_three");
map.put("gatling", "type_three");
} }
public static String getValue(String key){ public static String getValue(String key){
return map.get(key); return map.get(key);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment