ソースを参照

保证金bug修改

yewc 1 年間 前
コミット
b8b69582b3

+ 5 - 4
zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyServiceImpl.java

@@ -183,11 +183,10 @@ public class UseMoneyServiceImpl implements UseMoneyService {
         Set<String> companyIds = convertSet(records, UseMoneyEarnestRespVO::getPaymentCompanyId);
         Map<String, CompanyRespDTO> companyMap = companyApi.getCompanyMap(companyIds);
         for (UseMoneyEarnestRespVO record : records) {
-            if (1 == record.getIWriteOff()) {
-                record.setStatus("已核销");
-            }
-            if (0 == record.getIWriteOff()) {
+            if (record.getIWriteOff()==null||0 == record.getIWriteOff()) {
                 record.setStatus("未核销");
+            }else if (1 == record.getIWriteOff()) {
+                record.setStatus("已核销");
             }
             CompanyRespDTO companyRespDTO = companyMap.get(record.getPaymentCompanyId());
             if (companyRespDTO != null) {
@@ -434,6 +433,8 @@ public class UseMoneyServiceImpl implements UseMoneyService {
                 detailDO.setUseMoneyId(updateObj.getId());
                 detailDO.setIsvalid(1);
                 detailDO.setCreateTime(LocalDateTime.now());
+                detailDO.setIWriteOff(0);
+                detailDO.setWriteOffAmount(new BigDecimal(0));
             });
             useMoneyDetailDao.insertBatch(detailDOS);
         }

+ 0 - 3
zjugis-business/src/main/resources/templates/ProjectStatus/index.ftl

@@ -59,9 +59,6 @@ styles=[ '/flow/css/formCommon.css' ,'/timeSelector/TimeSelector.css','/OwCommon
                     <input type="hidden" name="createReqVO$projectId" value="${formEntity.projectId!}">
                     <div class="z-comp-input" name="createReqVO$projectName">
                       <input type="text" value="${projectName!}">
-                      <div id="selectProject" style="width: 50px; float: right;">
-                        <div class="btn btn-sm btn-primary">选择</div>
-                      </div>
                     </div>
                   </div>
                 </div>