保证金修改

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java

@@ -12,6 +12,7 @@ import java.util.List;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
@@ -125,6 +126,11 @@ public class BsSgcJsjdBuiProgressInfoController extends BaseController
 //        if(userType!=null&&!userType.equals("00")){
 //            throw new CustomException("非水行政主管部门不可填报");
 //        }
+        QueryWrapper<BsSgcJsjdBuiProgressInfo>queryWrapper=new QueryWrapper<>();
+        BsSgcJsjdBuiProgressInfo one = bsSgcJsjdBuiProgressInfoService.getOne(queryWrapper.eq("stage_time", bsSgcJsjdBuiProgressInfo.getStageTime()));
+        if (!ObjectUtils.isEmpty(one)){
+            return AjaxResult.error("当月进度已存在");
+        }
         BaseEntityUtils.preInsert(bsSgcJsjdBuiProgressInfo);
         bsSgcJsjdBuiProgressInfo.setStatus("0"); //未上报
         return toAjax(bsSgcJsjdBuiProgressInfoService.save(bsSgcJsjdBuiProgressInfo));
@@ -148,7 +154,7 @@ public class BsSgcJsjdBuiProgressInfoController extends BaseController
             int month = instance.get(Calendar.MONTH);
             if(StringUtils.isNotEmpty(bsSgcJsjdBuiProgressInfo.getProgressPlanId())) {
                 UpdateWrapper<BsSgcJsjdBuiProgressPlan> update = Wrappers.update();
-                update.set("v" + month, bsSgcJsjdBuiProgressInfo.getCompleteInvestment());
+                update.set("v" + (month+1), bsSgcJsjdBuiProgressInfo.getCompleteInvestment());
                 update.eq("id", bsSgcJsjdBuiProgressInfo.getProgressPlanId());
                 bsSgcJsjdBuiProgressPlanService.update(update);
             }

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSubProjectQualityController.java

@@ -106,8 +106,8 @@ public class BsSgcJsjdBuiSubProjectQualityController extends BaseController
     {
         BaseEntityUtils.preInsert(bsSgcJsjdBuiSubProjectQuality);
         LambdaQueryWrapper<BsSgcJsjdBuiUnitQualityRate> queryWrapper = Wrappers.lambdaQuery(BsSgcJsjdBuiUnitQualityRate.class);
-        queryWrapper.eq(BsSgcJsjdBuiUnitQualityRate::getProCode, bsSgcJsjdBuiSubProjectQuality.getProCode());
-        queryWrapper.eq(BsSgcJsjdBuiUnitQualityRate::getProNo, bsSgcJsjdBuiSubProjectQuality.getProNo());
+//        queryWrapper.eq(BsSgcJsjdBuiUnitQualityRate::getProCode, bsSgcJsjdBuiSubProjectQuality.getProCode());
+        queryWrapper.eq(BsSgcJsjdBuiUnitQualityRate::getId, bsSgcJsjdBuiSubProjectQuality.getId());
         BsSgcJsjdBuiUnitQualityRate one = bsSgcJsjdBuiUnitQualityRateService.getOne(queryWrapper);
         if (one == null) {
             BsSgcJsjdBuiUnitQualityRate qualityRate = new BsSgcJsjdBuiUnitQualityRate();

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSalaryEnsure.java

@@ -30,55 +30,59 @@ public class BsSgcJsjdBuiSalaryEnsure extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** 差异化缴存金额 */
-    @Excel(name = "差异化缴存金额")
-    @ApiModelProperty("差异化缴存金额")
-    private String differentiatedDepositAmount;
-
-    /** 应缴金额 */
-    @Excel(name = "应缴金额")
-    @ApiModelProperty("应缴金额")
-    private String amountPayable;
-
-    /** 已缴纳金额 */
-    @Excel(name = "已缴纳金额")
-    @ApiModelProperty("已缴纳金额")
-    private String paidAmount;
-
-    /** 收支方式 */
-    @Excel(name = "收支方式")
-    @ApiModelProperty("收支方式")
+    @Excel(name = "现金金额")
+    @ApiModelProperty("现金金额")
+    private String cashAmount;
+
+    @Excel(name = "缴存方式")
+    @ApiModelProperty("缴存方式")
     @TableField(typeHandler = FastjsonTypeHandler.class)
-    private String[] incomeExpenditureMethods;
+    private String[] depositMethods;
+
+    @Excel(name = "缴存金额")
+    @ApiModelProperty("缴存金额")
+    private String depositAmount;
 
-    /** 工资保证金开户银行 */
-    @Excel(name = "工资保证金开户银行")
-    @ApiModelProperty("工资保证金开户银行")
-    private String depositBankSalaryDeposit;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "缴存日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("缴存日期")
+    private Date depositAmountDate;
 
-    /** 工资保证金银行账户 */
-    @Excel(name = "工资保证金银行账户")
-    @ApiModelProperty("工资保证金银行账户")
-    private String salaryDepositBankAccount;
+    @Excel(name = "缴存银行名称")
+    @ApiModelProperty("缴存银行名称")
+    private String depositBank;
 
-    /** 现金金额 */
-    @Excel(name = "现金金额")
-    @ApiModelProperty("现金金额")
-    private String cashAmount;
+    @Excel(name = "缴存保证金银行号")
+    @ApiModelProperty("缴存保证金银行号")
+    private String depositBankNumber;
+
+    @Excel(name = "开户行地址")
+    @ApiModelProperty("开户行地址")
+    private String accountBankAddress;
 
-    /** 担保银行名称 */
-    @Excel(name = "担保银行名称")
-    @ApiModelProperty("担保银行名称")
+    @Excel(name = "缴存凭证号")
+    @ApiModelProperty("缴存凭证号")
+    private String voucherNumber;
+
+    @Excel(name = "现金存储附件材料")
+    @ApiModelProperty("现金存储附件材料")
+    private String cashStorageFile;
+
+    /** 银行保函缓存单位 */
+    @Excel(name = "缓存单位名称")
+    @ApiModelProperty("缓存单位名称")
     private String guaranteeBankName;
 
+
+    //银行保函
     /** 银行保函函号 */
-    @Excel(name = "银行保函函号")
-    @ApiModelProperty("银行保函函号")
+    @Excel(name = "保函编号")
+    @ApiModelProperty("保函编号")
     private String bankGuaranteeLetterNo;
 
     /** 银行保函担保金额 */
-    @Excel(name = "银行保函担保金额")
-    @ApiModelProperty("银行保函担保金额")
+    @Excel(name = "银行保函金额")
+    @ApiModelProperty("银行保函金额")
     private String bankGuaranteeLetterAmount;
 
     /** 银行保函有效期起始日期 */
@@ -91,14 +95,23 @@ public class BsSgcJsjdBuiSalaryEnsure extends BaseEntity
     @ApiModelProperty("终止日期")
     private String bankGuaranteeEndYear;
 
+    @Excel(name = "开立银行名称")
+    @ApiModelProperty("开立银行名称")
+    private String openBankName;
+
+    @Excel(name = "银行保函附件材料")
+    @ApiModelProperty("银行保函附件材料")
+    private String bankGuaranteeFile;
+
+    //工程担保公司保函
     /** 担保公司名称 */
     @Excel(name = "担保公司名称")
     @ApiModelProperty("担保公司名称")
     private String guaranteeCompanyName;
 
     /** 担保公司保函函号 */
-    @Excel(name = "担保公司保函函号")
-    @ApiModelProperty("担保公司保函函号")
+    @Excel(name = "担保公司保函函编号")
+    @ApiModelProperty("担保公司保函函编号")
     private String guaranteeCompanyLetterNo;
 
     /** 担保公司担保金额 */
@@ -117,14 +130,19 @@ public class BsSgcJsjdBuiSalaryEnsure extends BaseEntity
     @ApiModelProperty("担保公司终止日期")
     private String guaranteeCompanyEndYear;
 
+    @Excel(name = "担保公司附件")
+    @ApiModelProperty("担保公司附件")
+    private String guaranteeCompanyFile;
+
+    //工程保证保险
     /** 保险公司名称 */
     @Excel(name = "保险公司名称")
     @ApiModelProperty("保险公司名称")
     private String insuranceCompanyName;
 
     /** 保险单号 */
-    @Excel(name = "保险单号")
-    @ApiModelProperty("保险单号")
+    @Excel(name = "保险合同编号")
+    @ApiModelProperty("保险合同编号")
     private String insuranceNo;
 
     /** 保险金额 */
@@ -144,6 +162,18 @@ public class BsSgcJsjdBuiSalaryEnsure extends BaseEntity
     @ApiModelProperty("保险终止日期")
     private Date insuranceEndTime;
 
+    @Excel(name = "支付保险费金额")
+    @ApiModelProperty("支付保险费金额")
+    private String payAmountInsurance;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "支付保险费日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("支付保险费日期")
+    private Date payAmountInsuranceTime;
+
+    @Excel(name = "工程保证保险附件材料")
+    @ApiModelProperty("工程保证保险附件材料")
+    private String InsuranceFile;
     /** 其他金额 */
     @Excel(name = "其他金额")
     @ApiModelProperty("其他金额")