保证金修改

jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java

@@ -63,19 +63,23 @@ public class CommonController
         {
             String uploadType = JianweiConfig.getUploadType();
             if (uploadType.equals("disk")) {
-                // 本地资源路径
+//                 本地资源路径
 //                String localPath = JianweiConfig.getProfile();
 //                // 数据库资源地址
 //                String downloadPath = localPath + StringUtils.substringAfter(fileName, Constants.RESOURCE_PREFIX);
-
+                StringBuilder desiredPath=new StringBuilder("/"+fileName);
-                String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+                String realFileName=fileName;
+                if (fileName.contains("/")) {
+                     realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
 
                 String[] parts = fileName.split("/");
-                StringBuilder desiredPath = new StringBuilder("/");
+                 desiredPath = new StringBuilder("/");
                 for (int i = 2; i < parts.length; i++) {
                     desiredPath.append(parts[i]).append("/");
                 }
-                desiredPath.deleteCharAt(desiredPath.length() - 1);
+
+                    desiredPath.deleteCharAt(desiredPath.length() - 1);
+                }
                 String filePath = JianweiConfig.getDownloadPath() + desiredPath.toString();
 
 //                // 下载名称

jwtech-framework/src/main/java/com/jianwei/common/utils/poi/ExcelUtil.java

@@ -788,7 +788,7 @@ public class ExcelUtil<T> {
 	 * @param filename 文件名称
 	 */
 	public String getAbsoluteFile(String filename) {
-		String downloadPath = JianweiConfig.getDownloadPath() + filename;
+		String downloadPath = JianweiConfig.getDownloadPath() + "/"+filename;
 		File desc = new File(downloadPath);
 		if (!desc.getParentFile().exists()) {
 			desc.getParentFile().mkdirs();

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

@@ -79,6 +79,14 @@ public class BsSgcJsjdBuiAttendanceInformationController extends BaseController
         return util.exportExcel(list, "attendance");
     }
 
+    @Log(title = "农民工人员考勤信息导入模板导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportTemplate")
+    @ApiOperation("农民工人员考勤信息导入模板导出")
+    public AjaxResult  exportTemplate(){
+        ExcelUtil<BsSgcJsjdBuiAttendanceInformationExcel>util=new ExcelUtil<>(BsSgcJsjdBuiAttendanceInformationExcel.class);
+        return util.exportExcel(new ArrayList<>(),"农民工人员考勤信息导入模板");
+    }
+
     /**
      * 获取农民工人员考勤信息详细信息
      */
@@ -165,8 +173,7 @@ public class BsSgcJsjdBuiAttendanceInformationController extends BaseController
     @ApiOperation("农民工人员考勤信息模板生成")
     public AjaxResult tagTemplate() {
         ExcelUtil<BsSgcJsjdBuiAttendanceInformationExcel> util = new ExcelUtil<>(BsSgcJsjdBuiAttendanceInformationExcel.class);
-        List<BsSgcJsjdBuiAttendanceInformationExcel> list = new ArrayList<>();
+        return util.exportExcel(new ArrayList<>(),"农民工人员考勤信息导入模板");
-        return util.exportExcel(list,"农民工人员考勤信息导入模板");
     }
 
 }

jwtech-system/src/main/java/com/kms/earlyStage/domain/BsSlgcQqjdTbbzj.java

@@ -30,55 +30,55 @@ public class BsSlgcQqjdTbbzj 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("收支方式")
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private String[] incomeExpenditureMethods;
-
-    /** 工资保证金开户银行 */
-    @Excel(name = "工资保证金开户银行")
-    @ApiModelProperty("工资保证金开户银行")
-    private String depositBankSalaryDeposit;
-
-    /** 工资保证金银行账户 */
-    @Excel(name = "工资保证金银行账户")
-    @ApiModelProperty("工资保证金银行账户")
-    private String salaryDepositBankAccount;
-
-    /** 现金金额 */
     @Excel(name = "现金金额")
     @ApiModelProperty("现金金额")
     private String cashAmount;
 
-    /** 担保银行名称 */
+    @Excel(name = "缴存金额")
-    @Excel(name = "担保银行名称")
+    @ApiModelProperty("缴存金额")
-    @ApiModelProperty("担保银行名称")
+    private String depositAmount;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "缴存日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("缴存日期")
+    private Date depositAmountDate;
+
+    @Excel(name = "缴存银行名称")
+    @ApiModelProperty("缴存银行名称")
+    private String depositBank;
+
+    @Excel(name = "缴存保证金银行号")
+    @ApiModelProperty("缴存保证金银行号")
+    private String depositBankNumber;
+
+    @Excel(name = "开户行地址")
+    @ApiModelProperty("开户行地址")
+    private String accountBankAddress;
+
+    @Excel(name = "缴存凭证号")
+    @ApiModelProperty("缴存凭证号")
+    private String voucherNumber;
+
+    @Excel(name = "现金存储附件材料")
+    @ApiModelProperty("现金存储附件材料")
+    private String CashStorageFile;
+
+    /** 银行保函缓存单位 */
+    @Excel(name = "缓存单位名称")
+    @ApiModelProperty("缓存单位名称")
     private String guaranteeBankName;
 
+
+    //银行保函
     /** 银行保函函号 */
-    @Excel(name = "银行保函函号")
+    @Excel(name = "保函编号")
-    @ApiModelProperty("银行保函函号")
+    @ApiModelProperty("保函编号")
     private String bankGuaranteeLetterNo;
 
     /** 银行保函担保金额 */
-    @Excel(name = "银行保函担保金额")
+    @Excel(name = "银行保函金额")
-    @ApiModelProperty("银行保函担保金额")
+    @ApiModelProperty("银行保函金额")
     private String bankGuaranteeLetterAmount;
 
     /** 银行保函有效期起始日期 */
@@ -91,14 +91,23 @@ public class BsSlgcQqjdTbbzj 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 = "担保公司保函函号")
+    @Excel(name = "担保公司保函函编号")
-    @ApiModelProperty("担保公司保函函号")
+    @ApiModelProperty("担保公司保函函编号")
     private String guaranteeCompanyLetterNo;
 
     /** 担保公司担保金额 */
@@ -117,14 +126,19 @@ public class BsSlgcQqjdTbbzj extends BaseEntity
     @ApiModelProperty("担保公司终止日期")
     private String guaranteeCompanyEndYear;
 
+    @Excel(name = "担保公司附件")
+    @ApiModelProperty("担保公司附件")
+    private String guaranteeCompanyFile;
+
+    //工程保证保险
     /** 保险公司名称 */
     @Excel(name = "保险公司名称")
     @ApiModelProperty("保险公司名称")
     private String insuranceCompanyName;
 
     /** 保险单号 */
-    @Excel(name = "保险单号")
+    @Excel(name = "保险合同编号")
-    @ApiModelProperty("保险单号")
+    @ApiModelProperty("保险合同编号")
     private String insuranceNo;
 
     /** 保险金额 */
@@ -144,6 +158,19 @@ public class BsSlgcQqjdTbbzj 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("其他金额")