From 601bb38a72ec10d43962cdcf1bd7b51835e8b011 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 一月 2024 18:32:45 +0800
Subject: [PATCH] 调整
---
server/service/src/main/java/com/doumee/dao/business/model/Solutions.java | 4
server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java | 4
server/service/src/main/java/com/doumee/dao/business/model/Worktype.java | 4
server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 4
server/service/src/main/java/com/doumee/dao/business/model/Member.java | 6
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 7
server/service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java | 4
server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java | 4
server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java | 6
server/company/src/main/java/com/doumee/api/business/CompanyController.java | 37 --
server/platform/src/main/java/com/doumee/api/business/TaxesController.java | 15 +
server/service/src/main/java/com/doumee/dao/business/model/TaxDetial.java | 33 ++
server/service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java | 4
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 4
server/service/src/main/java/com/doumee/dao/business/model/Taxes.java | 68 ++++
server/service/src/main/java/com/doumee/dao/business/model/Notices.java | 4
server/service/src/main/java/com/doumee/dao/business/model/Areas.java | 4
server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java | 4
server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 6
server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java | 6
server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java | 6
server/service/src/main/java/com/doumee/dao/business/model/DuLog.java | 4
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 6
server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java | 4
server/platform/src/main/java/com/doumee/api/business/CompanyController.java | 48 +++
server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java | 6
server/service/src/main/java/com/doumee/dao/business/model/SignRecord.java | 6
server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 272 +++++++++++++++-----
server/service/src/main/java/com/doumee/dao/business/model/Company.java | 6
server/service/src/main/java/com/doumee/dao/business/join/TaxesJoinMapper.java | 15 +
server/service/src/main/java/com/doumee/dao/business/join/TaxDetailJoinMapper.java | 15 +
server/service/src/main/java/com/doumee/dao/business/model/DuWorktype.java | 6
/dev/null | 90 ------
server/service/src/main/java/com/doumee/service/business/TaxesService.java | 3
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 8
server/platform/src/main/java/com/doumee/shiro/ShiroRealm.java | 18 +
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 14
server/service/src/main/java/com/doumee/dao/business/model/Multifile.java | 4
server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java | 4
server/service/src/main/java/com/doumee/dao/business/model/Insurance.java | 4
41 files changed, 479 insertions(+), 289 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/CompanyController.java b/server/company/src/main/java/com/doumee/api/business/CompanyController.java
index 636b45d..5687677 100644
--- a/server/company/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/company/src/main/java/com/doumee/api/business/CompanyController.java
@@ -70,48 +70,11 @@
companyService.startSignAuth(company.getId());
return ApiResponse.success(null);
}
-
- @ApiOperation("鏍规嵁ID绂佺敤鍚敤")
- @PostMapping("/updateStatus")
- @RequiresPermissions("business:company:update")
- public ApiResponse updateStatus(@RequestBody Company company) {
- companyService.updateStatus(company);
- return ApiResponse.success(null);
- }
- @ApiOperation("淇敼淇濋櫓鏂规")
- @PostMapping("/updateSolutions")
- @RequiresPermissions("business:company:update")
- public ApiResponse updateSolutions(@RequestBody Company company) {
- companyService.updateSolutions(company);
- return ApiResponse.success(null);
- }
- @ApiOperation("浼佷笟鏇存崲鎵嬫満鍙�")
- @PostMapping("/updatePhone")
- @RequiresPermissions("business:company:update")
- public ApiResponse updatePhone(@RequestBody Company company) {
- companyService.updatePhone(company);
- return ApiResponse.success(null);
- }
- @ApiOperation("鏍规嵁ID鐢靛瓙绛捐璇佷紒涓氫俊鎭�")
- @PostMapping("/startSignAuth/{id}")
- @RequiresPermissions("business:company:update")
- public ApiResponse startSignAuth(@PathVariable Integer id) {
- companyService.startSignAuth(id);
- return ApiResponse.success(null);
- }
-
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:company:query")
public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
//鏉冮檺鑼冨洿鍐�
- return ApiResponse.success(companyService.findPage(pageWrap));
- }
- @ApiOperation("鏌ヨ鍏ㄩ儴鏁版嵁(璐﹀彿鍒嗛厤浼佷笟浣跨敤)")
- @PostMapping("/pageAll")
- @RequiresPermissions("business:companypermission:create")
- public ApiResponse<PageData<Company>> findPageAll (@RequestBody PageWrap<Company> pageWrap) {
- pageWrap.getModel().setQueryFlag(Constants.ONE);//鏌ヨ鍏ㄩ儴
return ApiResponse.success(companyService.findPage(pageWrap));
}
diff --git a/server/company/src/main/java/com/doumee/api/business/SolutionsBaseController.java b/server/company/src/main/java/com/doumee/api/business/SolutionsBaseController.java
deleted file mode 100644
index 8cb5051..0000000
--- a/server/company/src/main/java/com/doumee/api/business/SolutionsBaseController.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.doumee.api.business;
-
-import com.doumee.api.BaseController;
-import com.doumee.core.annotation.excel.ExcelExporter;
-import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
-import com.doumee.dao.business.model.SolutionsBase;
-import com.doumee.service.business.SolutionsBaseService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 姹熻箘韫�
- * @date 2024/01/16 10:03
- */
-@Api(tags = "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�")
-@RestController
-@RequestMapping("/business/solutionsBase")
-public class SolutionsBaseController extends BaseController {
-
- @Autowired
- private SolutionsBaseService solutionsBaseService;
-
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:solutionsbase:create")
- public ApiResponse create(@RequestBody SolutionsBase solutionsBase) {
- return ApiResponse.success(solutionsBaseService.create(solutionsBase));
- }
-
- @ApiOperation("鏍规嵁ID鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("business:solutionsbase:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- solutionsBaseService.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- @RequiresPermissions("business:solutionsbase:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- solutionsBaseService.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:solutionsbase:update")
- public ApiResponse updateById(@RequestBody SolutionsBase solutionsBase) {
- solutionsBaseService.updateById(solutionsBase);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("business:solutionsbase:query")
- public ApiResponse<PageData<SolutionsBase>> findPage (@RequestBody PageWrap<SolutionsBase> pageWrap) {
- return ApiResponse.success(solutionsBaseService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
- @PostMapping("/exportExcel")
- @RequiresPermissions("business:solutionsbase:exportExcel")
- public void exportExcel (@RequestBody PageWrap<SolutionsBase> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(SolutionsBase.class).export(solutionsBaseService.findPage(pageWrap).getRecords(), "淇濋櫓鏂规淇℃伅琛�(鍩鸿〃锛�", response);
- }
-
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:solutionsbase:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(solutionsBaseService.findById(id));
- }
-}
diff --git a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
index 66b1143..2345fc5 100644
--- a/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/CompanyController.java
@@ -6,11 +6,12 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Company;
import com.doumee.service.business.CompanyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -35,7 +36,9 @@
@PostMapping("/create")
@RequiresPermissions("business:company:create")
public ApiResponse create(@RequestBody Company company) {
- return ApiResponse.success(companyService.create(company));
+ companyService.create(company);
+ companyService.startSignAuth(company.getId());
+ return ApiResponse.success(null);
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@@ -64,6 +67,36 @@
@RequiresPermissions("business:company:update")
public ApiResponse updateById(@RequestBody Company company) {
companyService.updateById(company);
+ companyService.startSignAuth(company.getId());
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID绂佺敤鍚敤")
+ @PostMapping("/updateStatus")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updateStatus(@RequestBody Company company) {
+ companyService.updateStatus(company);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("淇敼淇濋櫓鏂规")
+ @PostMapping("/updateSolutions")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updateSolutions(@RequestBody Company company) {
+ companyService.updateSolutions(company);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("浼佷笟鏇存崲鎵嬫満鍙�")
+ @PostMapping("/updatePhone")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updatePhone(@RequestBody Company company) {
+ companyService.updatePhone(company);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("鏍规嵁ID鐢靛瓙绛捐璇佷紒涓氫俊鎭�")
+ @PostMapping("/startSignAuth/{id}")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse startSignAuth(@PathVariable Integer id) {
+ companyService.startSignAuth(id);
return ApiResponse.success(null);
}
@@ -71,6 +104,14 @@
@PostMapping("/page")
@RequiresPermissions("business:company:query")
public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
+ //鏉冮檺鑼冨洿鍐�
+ return ApiResponse.success(companyService.findPage(pageWrap));
+ }
+ @ApiOperation("鏌ヨ鍏ㄩ儴鏁版嵁(璐﹀彿鍒嗛厤浼佷笟浣跨敤)")
+ @PostMapping("/pageAll")
+ @RequiresPermissions("business:companypermission:create")
+ public ApiResponse<PageData<Company>> findPageAll (@RequestBody PageWrap<Company> pageWrap) {
+ pageWrap.getModel().setQueryFlag(Constants.ONE);//鏌ヨ鍏ㄩ儴
return ApiResponse.success(companyService.findPage(pageWrap));
}
@@ -84,7 +125,8 @@
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:company:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse<Company> findById(@PathVariable Integer id) {
+
return ApiResponse.success(companyService.findById(id));
}
}
diff --git a/server/platform/src/main/java/com/doumee/api/business/TaxesController.java b/server/platform/src/main/java/com/doumee/api/business/TaxesController.java
index f3a3665..22f281e 100644
--- a/server/platform/src/main/java/com/doumee/api/business/TaxesController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/TaxesController.java
@@ -67,6 +67,21 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鏍规嵁ID閫�鍥炵敵璇�")
+ @PostMapping("/backApply")
+ @RequiresPermissions("business:taxes:update")
+ public ApiResponse backApply(@RequestBody Taxes taxes) {
+ taxesService.backApply(taxes);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("涓婁紶鍙戠エ鍑瘉鎻愪氦淇濆瓨")
+ @PostMapping("/doneApply")
+ @RequiresPermissions("business:taxes:update")
+ public ApiResponse doneApply(@RequestBody Taxes taxes) {
+ taxesService.doneApply(taxes);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:taxes:query")
diff --git a/server/platform/src/main/java/com/doumee/shiro/ShiroRealm.java b/server/platform/src/main/java/com/doumee/shiro/ShiroRealm.java
index f290a33..6fbf47c 100644
--- a/server/platform/src/main/java/com/doumee/shiro/ShiroRealm.java
+++ b/server/platform/src/main/java/com/doumee/shiro/ShiroRealm.java
@@ -4,9 +4,11 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.CompanyPermission;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.service.business.CompanyPermissionService;
import com.doumee.service.system.SystemDataPermissionService;
import com.doumee.service.system.SystemPermissionService;
import com.doumee.service.system.SystemRoleService;
@@ -23,6 +25,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -39,6 +42,9 @@
@Lazy
@Autowired
private SystemUserService systemUserService;
+ @Lazy
+ @Autowired
+ private CompanyPermissionService companyPermissionService;
@Lazy
@Autowired
@@ -88,6 +94,18 @@
List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions);
+ CompanyPermission c = new CompanyPermission();
+ c.setUserId(user.getId());
+ c.setIsdeleted(Constants.ZERO);
+ List<CompanyPermission> pList = companyPermissionService.findList(c);
+ if(pList!=null){
+ for (CompanyPermission cc : pList){
+ if(user.getCompanyIdList() == null){
+ user.setCompanyIdList(new ArrayList<>());
+ }
+ user.getCompanyIdList().add(cc.getCompanyId());
+ }
+ }
// 楠岃瘉鐢ㄦ埛
return new SimpleAuthenticationInfo(userInfo, user.getPassword(), this.getName());
}
diff --git a/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
index 127f16e..4b4ec6f 100644
--- a/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
@@ -44,8 +44,9 @@
private List<String> roles;
private List<String> permissions;
+ private List<Integer> companyIdList;
- public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions) {
+ public static LoginUserInfo from(SystemUser user, List<SystemRole> roles, List<SystemPermission> permissions ) {
if (user == null) {
return null;
}
@@ -65,6 +66,7 @@
pms.add(permission.getCode());
}
loginUserInfo.setPermissions(pms);
+ loginUserInfo.setCompanyIdList(user.getCompanyIdList());
return loginUserInfo;
}
}
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 20c9d1b..b4cae7f 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -65,6 +65,7 @@
public static final String SIGN_APPSECRET = "SIGN_APPSECRET";
public static final String COMPANY_FILE ="COMPANY_FILE" ;
public static final String SMS_COMNAME = "SMS_COMNAME";
+ public static final String TAXES_FILE = "TAXES_FILE";
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/TaxDetailJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/TaxDetailJoinMapper.java
new file mode 100644
index 0000000..b34c4ce
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/join/TaxDetailJoinMapper.java
@@ -0,0 +1,15 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.TaxDetial;
+import com.doumee.dao.business.model.Taxes;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+public interface TaxDetailJoinMapper extends MPJJoinMapper<TaxDetial> {
+
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/join/TaxesJoinMapper.java b/server/service/src/main/java/com/doumee/dao/business/join/TaxesJoinMapper.java
new file mode 100644
index 0000000..c5a3c0f
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/join/TaxesJoinMapper.java
@@ -0,0 +1,15 @@
+package com.doumee.dao.business.join;
+
+import com.doumee.dao.business.model.CompanySolution;
+import com.doumee.dao.business.model.Taxes;
+import com.github.yulichang.base.mapper.MPJJoinMapper;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+public interface TaxesJoinMapper extends MPJJoinMapper<Taxes> {
+ void insertBatchSomeColumn(List<Taxes> list);
+}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
index e4bbe09..9d29828 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChagneDetail.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,7 +74,7 @@
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index b312a26..5182170 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -65,7 +65,7 @@
@ApiModelProperty(value = "鎵瑰崟鐢熸晥鏃堕棿")
@ExcelColumn(name="鎵瑰崟鐢熸晥鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date applyStartTime;
@ApiModelProperty(value = "鐘舵�� 0寰呯缃� 1宸茬绔� 2宸蹭笂浼犳壒鍗� 3閫�鍥炵敵璇�")
@@ -74,7 +74,7 @@
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date validTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
index 15fe9ba..cf2bc14 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyDetail.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,7 +74,7 @@
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
index 4b9020a..9c4af99 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyLog.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Areas.java b/server/service/src/main/java/com/doumee/dao/business/model/Areas.java
index 48b4628..67de20f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Areas.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Areas.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "缂栬緫浜�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Company.java b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
index 09bc4dc..2a17391 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -33,7 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -124,7 +124,7 @@
@ApiModelProperty(value = "鐢靛瓙绛捐璇佹椂闂�")
@ExcelColumn(name="鐢靛瓙绛捐璇佹椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date signDate;
@ApiModelProperty(value = "鏌ヨ杈ㄨ瘑 0鏉冮檺鑼冨洿鍐� 1鍏ㄩ儴")
@TableField(exist = false)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java
index e293f39..14bd6ac 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanyPermission.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
index 312ff3f..33bf2ec 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
@@ -33,7 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java b/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java
index 74a61c0..694e3d7 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DispatchUnit.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -85,7 +85,7 @@
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
@ExcelColumn(name="瀹℃牳鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date checkDate;
@ApiModelProperty(value = "瀹℃牳澶囨敞")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java b/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
index 5e38b41..ef3e4fe 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java b/server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java
index 170596b..6fab539 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DuSolution.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -69,7 +69,7 @@
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
@ExcelColumn(name="瀹℃牳鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date checkDate;
@ApiModelProperty(value = "瀹℃牳澶囨敞")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DuWorktype.java b/server/service/src/main/java/com/doumee/dao/business/model/DuWorktype.java
index 4b0480b..e903e18 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DuWorktype.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DuWorktype.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -73,7 +73,7 @@
@ApiModelProperty(value = "瀹℃牳鏃堕棿")
@ExcelColumn(name="瀹℃牳鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date checkDate;
@ApiModelProperty(value = "瀹℃牳澶囨敞")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java b/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java
index 23ca4b1..fa99d57 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Insurance.java
@@ -33,7 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 58b97c8..3e0b1bc 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -65,27 +65,27 @@
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date applyEndTime;
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date applyStartTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date startTime;
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date checkDate;
@ApiModelProperty(value = "鏈�杩戞搷浣滃娉�")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java b/server/service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
index 3686f02..fab8562 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InterfaceLog.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Member.java b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
index e581d0f..2975493 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -69,7 +69,7 @@
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date idcardNo;
@ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
index e2d07a6..ae3a652 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Multifile.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Notices.java b/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
index 747ff93..c9dc43f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Notices.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
index ed2a73d..2cdac0e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,7 +74,7 @@
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
index 88cddff..f55d8d8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaimsLog.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SignRecord.java b/server/service/src/main/java/com/doumee/dao/business/model/SignRecord.java
index 047433d..865bcbb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SignRecord.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SignRecord.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -81,7 +81,7 @@
@ApiModelProperty(value = "绛剧讲鏃堕棿")
@ExcelColumn(name="绛剧讲鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date signDate;
@ApiModelProperty(value = "绛剧讲澶囨敞")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java b/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
index e5a67f4..345c331 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SmsEmail.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java b/server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java
index 6cf2190..40a5f9a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SolutionWorktype.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
index fb0f70a..a6fe32f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Solutions.java
@@ -34,7 +34,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -43,7 +43,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
index 8dfaa81..6812937 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SolutionsBase.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/TaxDetial.java b/server/service/src/main/java/com/doumee/dao/business/model/TaxDetial.java
index c2f2640..157086c 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/TaxDetial.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/TaxDetial.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -32,7 +33,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -58,7 +59,7 @@
@ApiModelProperty(value = "鍔犲噺淇濆崟鎹敵璇风紪鐮侊紙鍏宠仈 apply_change锛�", example = "1")
@ExcelColumn(name="鍔犲噺淇濆崟鎹敵璇风紪鐮侊紙鍏宠仈 apply_change锛�")
- private Integer applyHcangeId;
+ private Integer applyChangeId;
@ApiModelProperty(value = "鍐茬孩鍗曞彂绁ㄧ紪鐮侊紙鍏宠仈taxes)", example = "1")
@ExcelColumn(name="鍐茬孩鍗曞彂绁ㄧ紪鐮侊紙鍏宠仈taxes)")
@@ -74,10 +75,34 @@
@ApiModelProperty(value = "浜х敓鎬昏垂鐢�", example = "1")
@ExcelColumn(name="浜х敓鎬昏垂鐢�")
- private BigDecimal tOTAlFee;
+ private BigDecimal totalFee;
@ApiModelProperty(value = "绫诲瀷 0淇濆崟鐢宠 1鍔犲噺淇濈敵璇� 2鍐茬孩鍗�", example = "1")
@ExcelColumn(name="绫诲瀷 0淇濆崟鐢宠 1鍔犲噺淇濈敵璇� 2鍐茬孩鍗�")
private Integer type;
+ @ApiModelProperty(value = "鍐茬孩鍗曞彂绁ㄥ彿", example = "1")
+ @TableField(exist = false)
+ private String taxDoneCode;
+ @ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О" )
+ @TableField(exist = false)
+ private String solutionName;
+ @ApiModelProperty(value = "鐢宠寮�绁ㄦ椂闂�" )
+ @TableField(exist = false)
+ private String taxCreateDate;
+ @ApiModelProperty(value = "淇濆崟鍙�" )
+ @TableField(exist = false)
+ private String applyCode;
+ @ApiModelProperty(value = "鎵瑰崟鍙�" )
+ @TableField(exist = false)
+ private String changApplyCode;
+ @ApiModelProperty(value = "鎶曚繚浜烘暟" )
+ @TableField(exist = false)
+ private String applyNum;
+ @ApiModelProperty(value = "鍔犱繚浜烘暟" )
+ @TableField(exist = false)
+ private String applyChangeAddNum;
+ @ApiModelProperty(value = "鍑忎繚浜烘暟" )
+ @TableField(exist = false)
+ private String applyChangeReduceNum;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java b/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java
index e0409cd..e02dcd8 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Taxes.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,8 +9,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.ArrayList;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 鍙戠エ淇℃伅琛�
@@ -32,7 +36,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +45,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "寮�鎴疯")
@@ -56,13 +60,16 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖", example = "1")
- @ExcelColumn(name="鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖")
+ @ApiModelProperty(value = "鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖 3宸插啿绾�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0寰呭鐞� 1宸插紑绁� 2骞冲彴鎾ゅ洖3宸插啿绾�")
private Integer status;
@ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany锛�", example = "1")
@ExcelColumn(name="浼佷笟缂栫爜锛堝叧鑱攃ompany锛�")
private Integer companyId;
+ @ApiModelProperty(value = "鏂规缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
+ @ExcelColumn(name="鏂规缂栫爜锛坰olutions锛�")
+ private Integer solutionId;
@ApiModelProperty(value = "鎬婚噾棰�", example = "1")
@ExcelColumn(name="鎬婚噾棰�")
@@ -88,13 +95,25 @@
@ExcelColumn(name="鍙戠エ鎺ユ敹鍦板潃")
private String addr;
- @ApiModelProperty(value = "寮�绁ㄥ悕绉�")
- @ExcelColumn(name="寮�绁ㄥ悕绉�")
+ @ApiModelProperty(value = "鐢宠浼佷笟鍚嶇О")
+ @ExcelColumn(name="鐢宠浼佷笟鍚嶇О")
private String companyName;
@ApiModelProperty(value = "鍙戠エ鐢靛瓙鐗�")
@ExcelColumn(name="鍙戠エ鐢靛瓙鐗�")
private String imgurl;
+ @ApiModelProperty(value = "鍙戠エ鍙�")
+ @ExcelColumn(name="鍙戠エ鍙�")
+ private String doneCode;
+ @ApiModelProperty(value = "涓婁紶鍙戠エ澶囨敞")
+ @ExcelColumn(name="涓婁紶鍙戠エ澶囨敞")
+ private String doneInfo;
+ @ApiModelProperty(value = "涓婁紶鍙戠エ鏃堕棿")
+ @ExcelColumn(name="涓婁紶鍙戠エ鏃堕棿")
+ private Date doneDate;
+ @ApiModelProperty(value = "涓婁紶鍙戠エ鐢ㄦ埛缂栫爜")
+ @ExcelColumn(name="涓婁紶鍙戠エ鐢ㄦ埛缂栫爜")
+ private Integer doneUserId;
@ApiModelProperty(value = "鍗曟嵁绫诲瀷 0濮旀墭寮�绁� 1鐩翠繚", example = "1")
@ExcelColumn(name="鍗曟嵁绫诲瀷 0濮旀墭寮�绁� 1鐩翠繚")
@@ -102,7 +121,7 @@
@ApiModelProperty(value = "骞冲彴鎾ゅ洖鏃堕棿")
@ExcelColumn(name="骞冲彴鎾ゅ洖鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date cancelDate;
@ApiModelProperty(value = "鎾ゅ洖澶囨敞")
@@ -112,5 +131,40 @@
@ApiModelProperty(value = "鎾ゅ洖鎿嶄綔浜哄憳缂栫爜", example = "1")
@ExcelColumn(name="鎾ゅ洖鎿嶄綔浜哄憳缂栫爜")
private Integer cancelUserId;
+ @ApiModelProperty(value = "鍐茬孩鏃堕棿")
+ @ExcelColumn(name="鍐茬孩鏃堕棿")
+ private Date delDate;
+ @ApiModelProperty(value = "鍐茬孩澶囨敞")
+ @ExcelColumn(name="鍐茬孩澶囨敞")
+ private String delIInfo;
+
+ @ApiModelProperty(value = "鍐茬孩鎿嶄綔浜哄憳缂栫爜", example = "1")
+ @ExcelColumn(name="鍐茬孩鎿嶄綔浜哄憳缂栫爜")
+ private Integer delUserId;
+
+
+ @ApiModelProperty(value = "鐢宠浜�")
+ @TableField(exist = false)
+ private String creatorName;
+ @ApiModelProperty(value = "鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionName;
+ @ApiModelProperty(value = "鍙戠エ闄勪欢瀹屾暣鏄剧ず鍦板潃")
+ @TableField(exist = false)
+ private String imgurlFull;
+
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date startDate;
+ @ApiModelProperty(value = "鏌ヨ鎴鏃堕棿")
+ @TableField(exist = false)
+ private Date endDate;
+
+ @ApiModelProperty(value = "鎶曚繚鍜屽姞鍑忎繚")
+ @TableField(exist = false)
+ List<TaxDetial> applyList;//
+ @ApiModelProperty(value = "鍐茬孩鍗曞垪琛�")
+ @TableField(exist = false)
+ List<TaxDetial> delTaxList ;//
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Worktype.java b/server/service/src/main/java/com/doumee/dao/business/model/Worktype.java
index b6b5686..2fec3c9 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Worktype.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Worktype.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 2679ba9..d66ac4d 100644
--- a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -17,6 +17,7 @@
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 绯荤粺鐢ㄦ埛
@@ -97,8 +98,11 @@
@ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
private Integer status;
- @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
+ @ApiModelProperty(value = "鎵�灞炰紒涓氫俊鎭")
@TableField(exist = false)
private Company company;
+ @ApiModelProperty(value = "鏉冮檺鍐呬紒涓氱紪鐮侀泦鍚�")
+ @TableField(exist = false)
+ private List<Integer> companyIdList;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/TaxesService.java b/server/service/src/main/java/com/doumee/service/business/TaxesService.java
index 4a962cc..d22b8b7 100644
--- a/server/service/src/main/java/com/doumee/service/business/TaxesService.java
+++ b/server/service/src/main/java/com/doumee/service/business/TaxesService.java
@@ -94,4 +94,7 @@
* @return long
*/
long count(Taxes taxes);
+
+ void doneApply(Taxes taxes);
+ void backApply(Taxes taxes);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 254ceb2..25f67a1 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -609,7 +609,12 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(pageWrap.getModel().getQueryFlag() == 0){
//鍙兘鐪嬫潈闄愯寖鍥村唴
- queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ queryWrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
+// queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
} else if (pageWrap.getModel().getQueryFlag() == 1) {
//鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
index ccd6223..ed4cc96 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
@@ -1,19 +1,36 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.TaxDetialMapper;
import com.doumee.dao.business.TaxesMapper;
-import com.doumee.dao.business.model.Taxes;
+import com.doumee.dao.business.join.TaxDetailJoinMapper;
+import com.doumee.dao.business.join.TaxesJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TaxesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import jdk.nashorn.internal.runtime.options.LoggingOption;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.yaml.snakeyaml.scanner.Constant;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -26,11 +43,128 @@
@Autowired
private TaxesMapper taxesMapper;
+ @Autowired
+ private TaxDetialMapper taxDetialMapper;
+ @Autowired
+ private TaxesJoinMapper taxesJoinMapper;
+ @Autowired
+ private TaxDetailJoinMapper taxDetailJoinMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(Taxes taxes) {
taxesMapper.insert(taxes);
return taxes.getId();
+ }
+
+ /**
+ * 閫�鍥炵敵璇�
+ * @param taxes
+ */
+ @Override
+ @Transactional
+ public void backApply(Taxes taxes) {
+ if(taxes.getId() == null ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Taxes model = taxesMapper.selectById(taxes.getId());
+ if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(taxes.getStatus(), Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鍙戠エ鐘舵�佷笉鏀寔鎾ゅ洖鐢宠锛�");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Taxes update = new Taxes();
+ update.setId(taxes.getId());
+ update.setImgurl(taxes.getImgurl());
+ update.setEditDate(new Date());
+ update.setStatus(Constants.TWO);
+ update.setEditor(user.getId());
+ update.setCancelUserId(user.getId());
+ update.setCancelDate(update.getEditDate());
+ update.setCancelInfo(taxes.getCancelInfo());
+ taxesMapper.updateById(update);
+
+ List<TaxDetial> detialList = getDetailListById(taxes.getId());
+ if(detialList!=null && detialList.size()>0){
+ for(TaxDetial detial :detialList){
+ //绫诲瀷 0淇濆崟鐢宠 1鍔犲噺淇濈敵璇� 2鍐茬孩鍗�
+ if(Constants.equalsInteger(detial.getType(),Constants.TWO)){
+ //濡傛灉鏄啿绾㈠崟锛岃繕鍘熻鐢宠涓哄凡寮�绁�
+ Taxes tu = new Taxes();
+ tu.setId(detial.getDelTaxId());
+ tu.setEditDate(new Date());
+ tu.setStatus(Constants.ONE);
+ tu.setEditor(user.getId());
+ taxesMapper.updateById(tu);
+ }
+ }
+ }
+ }
+
+ private List<TaxDetial> getDetailListById(Integer id) {
+ List<TaxDetial> detialList = taxDetialMapper.selectList(new QueryWrapper<TaxDetial>().lambda().eq(TaxDetial::getTaxId,id).eq(TaxDetial::getIsdeleted,Constants.ZERO));
+ return detialList;
+ }
+ private List<TaxDetial> getJoinDetailListById(Integer id) {
+ MPJLambdaWrapper<TaxDetial> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(TaxDetial.class);
+ queryWrapper.selectAs(Taxes::getDoneCode,TaxDetial::getTaxDoneCode);
+ queryWrapper.selectAs(Taxes::getCreateDate,TaxDetial::getTaxCreateDate);
+ queryWrapper.selectAs(InsuranceApply::getCode,TaxDetial::getApplyCode);
+ queryWrapper.selectAs(ApplyChange::getCode,TaxDetial::getChangApplyCode);
+ queryWrapper.select("(CASE t.type\n" +
+ "WHEN 0 THEN (select count(1) from apply_detail c where c.APPLY_ID=t.INSURANCE_APPLY_ID) \n" +
+ "ELSE 0 \n" +
+ "END) as applyNum,\n" +
+ "(CASE t.type \n" +
+ "WHEN 1 THEN (select count(1) from apply_chagne_detail c where c.APPLY_CHANGE_ID=t.INSURANCE_APPLY_ID) \n" +
+ "ELSE 0 \n" +
+ "END) as applyChangeAddNum,\n" +
+ "(CASE t.type \n" +
+ "WHEN 1 THEN (select count(1) from apply_chagne_detail c where c.APPLY_CHANGE_ID=t.APPLY_CHANGE_ID) \n" +
+ "ELSE 0 \n" +
+ "END) as applyChangeAddNum");
+ queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,TaxDetial::getInsuranceApplyId);
+ queryWrapper.leftJoin(ApplyChange.class,ApplyChange::getId,TaxDetial::getApplyChangeId);
+ queryWrapper.leftJoin(Taxes.class,Taxes::getId,TaxDetial::getDelTaxId);
+ List<TaxDetial> detialList = taxDetailJoinMapper.selectJoinList(TaxDetial.class,queryWrapper.orderByAsc(TaxDetial::getType));
+ return detialList;
+ }
+
+
+ /**
+ * 涓婁紶鍙戠エ鍑瘉
+ * @param taxes
+ */
+ @Override
+ public void doneApply(Taxes taxes) {
+ if(taxes.getId() == null
+ ||StringUtils.isBlank(taxes.getImgurl())
+ ||StringUtils.isBlank(taxes.getDoneCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Taxes model = taxesMapper.selectById(taxes.getId());
+ if(model == null ||Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsInteger(taxes.getStatus(), Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鍙戠エ鐘舵�佷笉鏀寔涓婁紶鍙戠エ淇℃伅锛�");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ Taxes update = new Taxes();
+ update.setId(taxes.getId());
+ update.setImgurl(taxes.getImgurl());
+ update.setEditDate(new Date());
+ update.setStatus(Constants.ONE);
+ update.setEditor(user.getId());
+ update.setDoneCode(taxes.getDoneCode());
+ update.setDoneUserId(user.getId());
+ update.setDoneDate(update.getEditDate());
+ update.setImgurl(taxes.getImgurl());
+ taxesMapper.updateById(update);
}
@Override
@@ -69,7 +203,33 @@
@Override
public Taxes findById(Integer id) {
- return taxesMapper.selectById(id);
+ MPJLambdaWrapper<Taxes> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Taxes.class);
+ queryWrapper.selectAs(Solutions::getName,Taxes::getSolutionName);
+ queryWrapper.leftJoin(Solutions.class,Solutions::getId,Taxes::getSolutionId);
+ Taxes model =taxesJoinMapper.selectById(id);
+ if(model==null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ //鏌ヨ鏄庣粏鍒楄〃
+ List<TaxDetial> detialList = getJoinDetailListById(id);
+ List<TaxDetial> applyList = new ArrayList<>();//鎶曚繚鍜屽姞鍑忎繚
+ List<TaxDetial> delList = new ArrayList<>();//鍐茬孩鍗�
+ if(detialList!=null){
+ for(TaxDetial d :delList){
+ d.setSolutionName(model.getSolutionName());
+ d.setFee(Constants.formatBigdecimal(d.getFee()));
+ d.setTotalFee(Constants.formatBigdecimal(d.getTotalFee()));
+ if(Constants.equalsInteger(d.getType(),Constants.ZERO) || Constants.equalsInteger(d.getType(),Constants.ONE)){
+ applyList.add(d);
+ }else if(Constants.equalsInteger(d.getType(),Constants.TWO)){
+ delList.add(d);
+ }
+ }
+ }
+ model.setApplyList(applyList);
+ model.setDelTaxList(delList);
+ return model;
}
@Override
@@ -86,86 +246,44 @@
@Override
public PageData<Taxes> findPage(PageWrap<Taxes> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
IPage<Taxes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Taxes> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Taxes> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Taxes.class);
+ queryWrapper.selectAs(SystemUser::getRealname,Taxes::getCreatorName);
+ queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Taxes::getCreator);
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Taxes::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(Taxes::getIsdeleted, Constants.ZERO);
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ queryWrapper.eq(Taxes::getCompanyId,-1);//璁剧疆鏃犳晥璁块棶
+ }else{
+ queryWrapper.in(Taxes::getCompanyId,user.getCompanyIdList());
+ queryWrapper.ge(pageWrap.getModel().getStartDate() != null,Taxes::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()));
+ queryWrapper.le(SignRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
+ queryWrapper.eq(pageWrap.getModel().getTaxBank() != null,Taxes::getTaxBank, pageWrap.getModel().getTaxBank());
+ queryWrapper.eq(pageWrap.getModel().getTaxBank() != null,Taxes::getTaxBank, pageWrap.getModel().getTaxBank());
+ queryWrapper.eq(pageWrap.getModel().getRemark() != null,Taxes::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(pageWrap.getModel().getStatus() != null,Taxes::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(pageWrap.getModel().getCompanyId() != null,Taxes::getCompanyId, pageWrap.getModel().getCompanyId());
+ queryWrapper.eq(pageWrap.getModel().getType() != null,Taxes::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(pageWrap.getModel().getTaxCode() != null,Taxes::getTaxCode, pageWrap.getModel().getTaxCode());
+ queryWrapper.eq(pageWrap.getModel().getTaxAccount() != null,Taxes::getTaxAccount, pageWrap.getModel().getTaxAccount());
+ queryWrapper.eq(pageWrap.getModel().getTaxAddr() != null,Taxes::getTaxAddr, pageWrap.getModel().getTaxAddr());
+ queryWrapper.eq(pageWrap.getModel().getAddr() !=null,Taxes::getAddr, pageWrap.getModel().getAddr());
+ queryWrapper.like(pageWrap.getModel().getCompanyName() != null,Taxes::getCompanyName, pageWrap.getModel().getCompanyName());
+ queryWrapper.eq(pageWrap.getModel().getApplyType() != null,Taxes::getApplyType, pageWrap.getModel().getApplyType());
+ queryWrapper.orderByDesc(Taxes::getCreateDate);
}
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Taxes::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Taxes::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Taxes::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Taxes::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Taxes::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Taxes::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getTaxBank() != null) {
- queryWrapper.lambda().eq(Taxes::getTaxBank, pageWrap.getModel().getTaxBank());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Taxes::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Taxes::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Taxes::getStatus, pageWrap.getModel().getStatus());
- }
- if (pageWrap.getModel().getCompanyId() != null) {
- queryWrapper.lambda().eq(Taxes::getCompanyId, pageWrap.getModel().getCompanyId());
- }
- if (pageWrap.getModel().getPrice() != null) {
- queryWrapper.lambda().eq(Taxes::getPrice, pageWrap.getModel().getPrice());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Taxes::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getTaxCode() != null) {
- queryWrapper.lambda().eq(Taxes::getTaxCode, pageWrap.getModel().getTaxCode());
- }
- if (pageWrap.getModel().getTaxAccount() != null) {
- queryWrapper.lambda().eq(Taxes::getTaxAccount, pageWrap.getModel().getTaxAccount());
- }
- if (pageWrap.getModel().getTaxAddr() != null) {
- queryWrapper.lambda().eq(Taxes::getTaxAddr, pageWrap.getModel().getTaxAddr());
- }
- if (pageWrap.getModel().getAddr() != null) {
- queryWrapper.lambda().eq(Taxes::getAddr, pageWrap.getModel().getAddr());
- }
- if (pageWrap.getModel().getCompanyName() != null) {
- queryWrapper.lambda().eq(Taxes::getCompanyName, pageWrap.getModel().getCompanyName());
- }
- if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(Taxes::getImgurl, pageWrap.getModel().getImgurl());
- }
- if (pageWrap.getModel().getApplyType() != null) {
- queryWrapper.lambda().eq(Taxes::getApplyType, pageWrap.getModel().getApplyType());
- }
- if (pageWrap.getModel().getCancelDate() != null) {
- queryWrapper.lambda().ge(Taxes::getCancelDate, Utils.Date.getStart(pageWrap.getModel().getCancelDate()));
- queryWrapper.lambda().le(Taxes::getCancelDate, Utils.Date.getEnd(pageWrap.getModel().getCancelDate()));
- }
- if (pageWrap.getModel().getCancelInfo() != null) {
- queryWrapper.lambda().eq(Taxes::getCancelInfo, pageWrap.getModel().getCancelInfo());
- }
- if (pageWrap.getModel().getCancelUserId() != null) {
- queryWrapper.lambda().eq(Taxes::getCancelUserId, pageWrap.getModel().getCancelUserId());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ PageData<Taxes> result =PageData.from(taxesJoinMapper.selectJoinPage(page,Taxes.class, queryWrapper));
+ if(result!=null && result.getRecords()!=null){
+ String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.TAXES_FILE).getCode();
+ for(Taxes t : result.getRecords()){
+ if(StringUtils.isNotBlank(t.getImgurl())){
+ t.setImgurlFull(path + t.getImgurl());
+ }
}
}
- return PageData.from(taxesMapper.selectPage(page, queryWrapper));
+ return result;
}
@Override
--
Gitblit v1.9.3