From e59a768f56efb64bf2fad412f62eca2a836b652f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 28 十二月 2023 14:13:00 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java | 154 +++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveParamMapper.java | 12 +
server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java | 2
server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 5
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 8
server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java | 97 ++++++++++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java | 8
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java | 18 +
server/db/business.approve_param.permissions.sql | 6
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 7
server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java | 2
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java | 86 +++++++++
server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java | 90 ++++++++++
15 files changed, 484 insertions(+), 14 deletions(-)
diff --git a/server/db/business.approve_param.permissions.sql b/server/db/business.approve_param.permissions.sql
new file mode 100644
index 0000000..922adc4
--- /dev/null
+++ b/server/db/business.approve_param.permissions.sql
@@ -0,0 +1,6 @@
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:create', '鏂板缓瀹℃壒妯＄増閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:delete', '鍒犻櫎瀹℃壒妯＄増閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:update', '淇敼瀹℃壒妯＄増閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:query', '鏌ヨ瀹℃壒妯＄増閰嶇疆淇℃伅琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:approveparam:exportExcel', '瀵煎嚭瀹℃壒妯＄増閰嶇疆淇℃伅琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
+
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
index 3517c4e..7e24363 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java
@@ -20,7 +20,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/30 15:33
+ * @date 2023/12/28 14:09
*/
@Api(tags = "瀹℃壒淇℃伅璁板綍琛�")
@RestController
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java
new file mode 100644
index 0000000..62a1f74
--- /dev/null
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java
@@ -0,0 +1,90 @@
+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.ApproveParam;
+import com.doumee.service.business.ApproveParamService;
+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 2023/12/28 11:46
+ */
+@Api(tags = "瀹℃壒妯＄増閰嶇疆淇℃伅琛�")
+@RestController
+@RequestMapping("/business/approveParam")
+public class ApproveParamController extends BaseController {
+
+ @Autowired
+ private ApproveParamService approveParamService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:approveparam:create")
+ public ApiResponse create(@RequestBody ApproveParam approveParam) {
+ return ApiResponse.success(approveParamService.create(approveParam));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:approveparam:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ approveParamService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:approveparam: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));
+ }
+ approveParamService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:approveparam:update")
+ public ApiResponse updateById(@RequestBody ApproveParam approveParam) {
+ approveParamService.updateById(approveParam);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:approveparam:query")
+ public ApiResponse<PageData<ApproveParam>> findPage (@RequestBody PageWrap<ApproveParam> pageWrap) {
+ return ApiResponse.success(approveParamService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:approveparam:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<ApproveParam> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(ApproveParam.class).export(approveParamService.findPage(pageWrap).getRecords(), "瀹℃壒妯＄増閰嶇疆淇℃伅琛�", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:approveparam:query")
+ public ApiResponse findById(@PathVariable Integer id) {
+ return ApiResponse.success(approveParamService.findById(id));
+ }
+}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java b/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
index 0ee8894..4e2cf2b 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
@@ -53,6 +53,7 @@
private void getRootOrgCode() {
SystemDictData org = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_ROOTORG_CODE);
if(org!=null){
+ SystemDictData orgName = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_ROOTORG_NAME);
String rootOrgId =org.getCode();
if(StringUtils.isBlank(rootOrgId)){
BaseResponse<OrgListResponse> res = HKService.getRootOrg(null);
@@ -60,6 +61,10 @@
org.setCode(res.getData().getOrgIndexCode());
org.setUpdateTime(new Date());
systemDictDataBiz.updateById( org);
+
+ orgName.setCode(res.getData().getOrgName());
+ orgName.setUpdateTime(new Date());
+ systemDictDataBiz.updateById( orgName);
}
}
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 7c9855f..52d7bd4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -30,6 +30,7 @@
public static final String HK_HTTPS ="HK_HTTPS" ;
public static final String HK_PUSH_URL = "HK_PUSH_URL";
public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
+ public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
index 7dc711c..cc95147 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveMapper.java
@@ -5,7 +5,7 @@
/**
* @author 姹熻箘韫�
- * @date 2023/11/30 15:33
+ * @date 2023/12/28 14:09
*/
public interface ApproveMapper extends BaseMapper<Approve> {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveParamMapper.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveParamMapper.java
new file mode 100644
index 0000000..a7f0618
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/ApproveParamMapper.java
@@ -0,0 +1,12 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.ApproveParam;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/12/28 11:46
+ */
+public interface ApproveParamMapper extends BaseMapper<ApproveParam> {
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
index d9416fe..80a50f6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Approve.java
@@ -13,7 +13,7 @@
/**
* 瀹℃壒淇℃伅璁板綍琛�
* @author 姹熻箘韫�
- * @date 2023/11/30 15:33
+ * @date 2023/12/28 14:09
*/
@Data
@ApiModel("瀹℃壒淇℃伅璁板綍琛�")
@@ -67,8 +67,8 @@
@ExcelColumn(name="ERP瀹℃壒缂栫爜")
private String erpId;
- @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 = "鐘舵�佷俊鎭�")
@@ -87,12 +87,20 @@
@ExcelColumn(name="瀹℃壒浜哄鍚�")
private String checkorName;
- @ApiModelProperty(value = "鏄惁缁堝", example = "1")
- @ExcelColumn(name="鏄惁缁堝")
+ @ApiModelProperty(value = "鏄惁缁堝 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁缁堝 0鍚� 1鏄�")
private Integer isEndCheck;
@ApiModelProperty(value = "璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�", example = "1")
@ExcelColumn(name="璁垮鐢宠璁板綍缂栫爜(鍏宠仈visit锛�")
private Integer visitId;
+ @ApiModelProperty(value = "瀹℃壒绛夌骇", example = "1")
+ @ExcelColumn(name="瀹℃壒绛夌骇")
+ private Integer level;
+
+ @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱", example = "1")
+ @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱")
+ private Integer approveType;
+
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
new file mode 100644
index 0000000..5eb0f4c
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java
@@ -0,0 +1,86 @@
+package com.doumee.dao.business.model;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 瀹℃壒妯＄増閰嶇疆淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2023/12/28 11:46
+ */
+@Data
+@ApiModel("瀹℃壒妯＄増閰嶇疆淇℃伅琛�")
+@TableName("`approve_param`")
+public class ApproveParam {
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name="涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String remark;
+
+ @ApiModelProperty(value = "绫诲瀷 0瀹℃壒 1鎶勯��", example = "1")
+ @ExcelColumn(name="绫诲瀷 0瀹℃壒 1鎶勯��")
+ private Integer type;
+
+ @ApiModelProperty(value = "瀹℃壒浜虹被鍨� 0琚浜� 1鎸囧畾浜哄憳 2閮ㄩ棬涓荤")
+ @ExcelColumn(name="瀹℃壒浜虹被鍨� 0琚浜� 1鎸囧畾浜哄憳 2閮ㄩ棬涓荤")
+ private String memberType;
+
+ @ApiModelProperty(value = "绛夌骇", example = "1")
+ @ExcelColumn(name="绛夌骇")
+ private Integer level;
+
+ @ApiModelProperty(value = "瀹℃壒浜哄鍚嶏紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ @ExcelColumn(name="瀹℃壒浜哄鍚嶏紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ private String objNames;
+
+ @ApiModelProperty(value = "瀹℃壒浜虹紪鐮侊紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ @ExcelColumn(name="瀹℃壒浜虹紪鐮侊紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ private String objIds;
+
+ @ApiModelProperty(value = "瀹℃壒涓荤绛夌骇 0鐩存帴涓荤 1浜岀骇涓荤 2涓夌骇涓荤 4鍥涚骇涓荤", example = "1")
+ @ExcelColumn(name="瀹℃壒涓荤绛夌骇 0鐩存帴涓荤 1浜岀骇涓荤 2涓夌骇涓荤 4鍥涚骇涓荤")
+ private Integer objLevel;
+
+ @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱", example = "1")
+ @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱")
+ private Integer approveType;
+
+ @ApiModelProperty(value = "鏃犱富绠￠�夐」 0娴佺▼缁撴潫 1鐢变笂绾т富绠′唬鏇垮鏍�", example = "1")
+ @ExcelColumn(name="鏃犱富绠￠�夐」 0娴佺▼缁撴潫 1鐢变笂绾т富绠′唬鏇垮鏍�")
+ private Integer noleaderOpt;
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
index 86ee196..b850f40 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/MemberCard.java
@@ -48,6 +48,10 @@
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "鍗＄被鍨� 0IC鍗� 1CPU鍗� 2杩滆窛绂诲崱 3M鍗�")
+ @ExcelColumn(name="鍗＄被鍨� 0IC鍗� 1CPU鍗� 2杩滆窛绂诲崱 3M鍗�")
+ private Integer type;
+
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
private String remark;
@@ -83,8 +87,8 @@
@ExcelColumn(name="娴峰悍鏍囪瘑")
private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java
new file mode 100644
index 0000000..f966565
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveParamService.java
@@ -0,0 +1,97 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.ApproveParam;
+import java.util.List;
+
+/**
+ * 瀹℃壒妯＄増閰嶇疆淇℃伅琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/12/28 11:46
+ */
+public interface ApproveParamService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param approveParam 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(ApproveParam approveParam);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param approveParam 瀹炰綋瀵硅薄
+ */
+ void delete(ApproveParam approveParam);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param approveParam 瀹炰綋瀵硅薄
+ */
+ void updateById(ApproveParam approveParam);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param approveParams 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<ApproveParam> approveParams);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return ApproveParam
+ */
+ ApproveParam findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param approveParam 瀹炰綋瀵硅薄
+ * @return ApproveParam
+ */
+ ApproveParam findOne(ApproveParam approveParam);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param approveParam 瀹炰綋瀵硅薄
+ * @return List<ApproveParam>
+ */
+ List<ApproveParam> findList(ApproveParam approveParam);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<ApproveParam>
+ */
+ PageData<ApproveParam> findPage(PageWrap<ApproveParam> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param approveParam 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(ApproveParam approveParam);
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
index 9479b04..f45349b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ApproveService.java
@@ -8,7 +8,7 @@
/**
* 瀹℃壒淇℃伅璁板綍琛⊿ervice瀹氫箟
* @author 姹熻箘韫�
- * @date 2023/11/30 15:33
+ * @date 2023/12/28 14:09
*/
public interface ApproveService {
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java
new file mode 100644
index 0000000..5243313
--- /dev/null
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java
@@ -0,0 +1,154 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.ApproveParamMapper;
+import com.doumee.dao.business.model.ApproveParam;
+import com.doumee.service.business.ApproveParamService;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * 瀹℃壒妯＄増閰嶇疆淇℃伅琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/12/28 11:46
+ */
+@Service
+public class ApproveParamServiceImpl implements ApproveParamService {
+
+ @Autowired
+ private ApproveParamMapper approveParamMapper;
+
+ @Override
+ public Integer create(ApproveParam approveParam) {
+ approveParamMapper.insert(approveParam);
+ return approveParam.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ approveParamMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(ApproveParam approveParam) {
+ UpdateWrapper<ApproveParam> deleteWrapper = new UpdateWrapper<>(approveParam);
+ approveParamMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ approveParamMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(ApproveParam approveParam) {
+ approveParamMapper.updateById(approveParam);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<ApproveParam> approveParams) {
+ if (CollectionUtils.isEmpty(approveParams)) {
+ return;
+ }
+ for (ApproveParam approveParam: approveParams) {
+ this.updateById(approveParam);
+ }
+ }
+
+ @Override
+ public ApproveParam findById(Integer id) {
+ return approveParamMapper.selectById(id);
+ }
+
+ @Override
+ public ApproveParam findOne(ApproveParam approveParam) {
+ QueryWrapper<ApproveParam> wrapper = new QueryWrapper<>(approveParam);
+ return approveParamMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<ApproveParam> findList(ApproveParam approveParam) {
+ QueryWrapper<ApproveParam> wrapper = new QueryWrapper<>(approveParam);
+ return approveParamMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<ApproveParam> findPage(PageWrap<ApproveParam> pageWrap) {
+ IPage<ApproveParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<ApproveParam> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(ApproveParam::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(ApproveParam::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(ApproveParam::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(ApproveParam::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getType, pageWrap.getModel().getType());
+ }
+ if (pageWrap.getModel().getMemberType() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getMemberType, pageWrap.getModel().getMemberType());
+ }
+ if (pageWrap.getModel().getLevel() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getLevel, pageWrap.getModel().getLevel());
+ }
+ if (pageWrap.getModel().getObjNames() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getObjNames, pageWrap.getModel().getObjNames());
+ }
+ if (pageWrap.getModel().getObjIds() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getObjIds, pageWrap.getModel().getObjIds());
+ }
+ if (pageWrap.getModel().getObjLevel() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getObjLevel, pageWrap.getModel().getObjLevel());
+ }
+ if (pageWrap.getModel().getApproveType() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getApproveType, pageWrap.getModel().getApproveType());
+ }
+ if (pageWrap.getModel().getNoleaderOpt() != null) {
+ queryWrapper.lambda().eq(ApproveParam::getNoleaderOpt, pageWrap.getModel().getNoleaderOpt());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(approveParamMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(ApproveParam approveParam) {
+ QueryWrapper<ApproveParam> wrapper = new QueryWrapper<>(approveParam);
+ return approveParamMapper.selectCount(wrapper);
+ }
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index fab895f..dc1fcee 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 瀹℃壒淇℃伅璁板綍琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/30 15:33
+ * @date 2023/12/28 14:09
*/
@Service
public class ApproveServiceImpl implements ApproveService {
@@ -145,6 +145,12 @@
if (pageWrap.getModel().getVisitId() != null) {
queryWrapper.lambda().eq(Approve::getVisitId, pageWrap.getModel().getVisitId());
}
+ if (pageWrap.getModel().getLevel() != null) {
+ queryWrapper.lambda().eq(Approve::getLevel, pageWrap.getModel().getLevel());
+ }
+ if (pageWrap.getModel().getApproveType() != null) {
+ queryWrapper.lambda().eq(Approve::getApproveType, pageWrap.getModel().getApproveType());
+ }
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 62c0042..de5e2d6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -135,17 +135,18 @@
BaseResponse<List<OrgUpdateFailureResponse>> result = HKService.delBatchOrg(request);
if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
//澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
- if(result.getData()!=null && result.getData().size()>0){
+ if(result.getData()!=null && result.getData().size()==0){
return true;
}
}
+
return false;
}
private OrgAddRequest getOrgAddModel(Company c ) {
OrgAddRequest model = new OrgAddRequest();
- model.setOrgIndexCode(HKConstants.RES_ORG_INDEX+ UUID.randomUUID().toString().replace("-",""));
+ model.setOrgIndexCode(c.getHkId());
model.setOrgName(c.getName());
// model.setOrgCode(c.getCode());
model.setParentIndexCode(c.getHkParentId());
@@ -207,7 +208,7 @@
company.setHkDate(company.getHkDate());
companyMapper.updateById(company);
//涓嬪彂娴峰悍瀹夐槻骞冲彴
- if(!delHkOrg(company)){
+ if(!delHkOrg(model)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝缁勭粐鍒犻櫎涓嬪彂澶辫触锛岃纭璇ョ粍缁囨棤涓嬬骇缁勭粐鎴栫粍缁囦汉鍛樹俊鎭瘇");
}
}
--
Gitblit v1.9.3