From 9bb3519ba7a38229b3c14252f29eb909a8e9977d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 5 Feb 2023 16:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/ctrl/XmRptConfigController.java   | 16 ++++------
 .../com/xm/core/ctrl/XmRptDataController.java | 30 +++++++++----------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java
index f14ccf62..3a9c2cf7 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java
@@ -80,16 +80,12 @@ public class XmRptConfigController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功新增一条数据");
 		try{
-		    boolean createPk=false;
-			if(!StringUtils.hasText(xmRptConfig.getId())) {
-			    createPk=true;
-				xmRptConfig.setId(xmRptConfigService.createKey("id"));
-			}
-			if(createPk==false){
-                 if(xmRptConfigService.selectOneObject(xmRptConfig) !=null ){
-                    return failed("pk-exists","编号重复，请修改编号再提交");
-                }
-            }
+			xmRptConfig.setId(xmRptConfigService.createKey("id"));
+			User user= LoginUtils.getCurrentUserInfo();
+			xmRptConfig.setCuserid(user.getUserid());
+			xmRptConfig.setCusername(user.getUsername());
+			xmRptConfig.setCbranchId(user.getBranchId());
+			xmRptConfig.setCtime(new Date());
 			xmRptConfigService.insert(xmRptConfig);
 			m.put("data",xmRptConfig);
 		}catch (BizException e) { 
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java
index 7403d801..235c1a2e 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java
@@ -2,8 +2,11 @@ package com.xm.core.ctrl;
 
 import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
+import com.mdp.core.utils.DateUtils;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.mybatis.PageUtils;
+import com.mdp.safe.client.entity.User;
+import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
 import com.xm.core.entity.XmRptData;
 import com.xm.core.service.XmRptDataService;
@@ -15,9 +18,8 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.mdp.core.utils.BaseUtils.toMap;
 import static com.mdp.core.utils.ResponseHelper.failed;
@@ -78,16 +80,13 @@ public class XmRptDataController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("成功新增一条数据");
 		try{
-		    boolean createPk=false;
-			if(!StringUtils.hasText(xmRptData.getId())) {
-			    createPk=true;
-				xmRptData.setId(xmRptDataService.createKey("id"));
-			}
-			if(createPk==false){
-                 if(xmRptDataService.selectOneObject(xmRptData) !=null ){
-                    return failed("pk-exists","编号重复，请修改编号再提交");
-                }
-            }
+			xmRptData.setId(xmRptDataService.createKey("id"));
+			User user= LoginUtils.getCurrentUserInfo();
+			xmRptData.setCuserid(user.getUserid());
+			xmRptData.setCusername(user.getUsername());
+			xmRptData.setCbranchId(user.getBranchId());
+			xmRptData.setCtime(new Date());
+			xmRptData.setBizDate(DateUtils.getDate("yyyy-MM-dd"));
 			xmRptDataService.insert(xmRptData);
 			m.put("data",xmRptData);
 		}catch (BizException e) {
@@ -234,7 +233,7 @@ public class XmRptDataController {
 	}
 	*/
 
-	/**
+
 	@ApiOperation( value = "根据主键列表批量删除xm_rpt_data信息",notes=" ")
 	@ApiResponses({
 		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
@@ -281,6 +280,5 @@ public class XmRptDataController {
         }  
         m.put("tips", tips);
         return m;
-	} 
-	*/
+	}
 }