From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 16 --------
server/src/main/java/doumeemes/api/system/SystemLoginLogController.java | 38 -------------------
server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java | 24 ------------
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 4 +-
server/src/main/java/doumeemes/config/shiro/ShiroToken.java | 7 ---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java | 8 ----
server/src/main/java/doumeemes/service/business/impl/WorkorderCheckAttrServiceImpl.java | 3 +
server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java | 16 --------
server/src/main/java/doumeemes/service/ext/impl/CheckAttrExtServiceImpl.java | 2
9 files changed, 5 insertions(+), 113 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
index b1e950a..169c167 100644
--- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
@@ -7,20 +7,7 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> dev
-import doumeemes.dao.business.model.Backorder;
-import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
-import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
-<<<<<<< HEAD
-=======
-import doumeemes.dao.ext.dto.CompanyLoginDTO;
->>>>>>> 1.0.3
-=======
->>>>>>> dev
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -61,8 +48,6 @@
@RequiresPermissions("system:loginLog:query")
public void export (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap, HttpServletResponse response) {
ExcelExporter.build(SystemLoginLog.class).exportWithFirstAndEnd(systemLoginLogService.findPage(pageWrap).getRecords(), "鐧诲綍鏃ュ織_"+System.currentTimeMillis(),"鐧诲綍鏃ュ織-"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
-<<<<<<< HEAD
-=======
}
@@ -77,31 +62,8 @@
@ApiOperation("浼佷笟鐧诲綍缁熻瀵煎嚭")
// @RequiresPermissions("system:loginLog:query")
public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
-<<<<<<< HEAD
ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
->>>>>>> 1.0.3
}
- @PostMapping("/companyLoginStatisticsPage")
- @ApiOperation("浼佷笟鐧诲綍缁熻")
-// @RequiresPermissions("system:loginLog:query")
- public ApiResponse<PageData<CompanyLoginStatisticsVO>> companyLoginStatisticsPage (@RequestBody PageWrap<CompanyLoginDTO> pageWrap) {
- return ApiResponse.success(systemUserService.companyLoginStatisticsPage(pageWrap));
- }
-
- @PostMapping("/companyLoginStatisticsExport")
- @ApiOperation("浼佷笟鐧诲綍缁熻瀵煎嚭")
-// @RequiresPermissions("system:loginLog:query")
- public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
- //ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻",null, response);
- ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(), response);
- }
-
-=======
- //ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻",null, response);
- ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(), response);
- }
-
->>>>>>> dev
}
diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
index 558ab19..14b3889 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
@@ -1,13 +1,6 @@
package doumeemes.config.shiro;
-<<<<<<< HEAD
-<<<<<<< HEAD
import doumeemes.core.model.LoginUserInfo;
-=======
->>>>>>> 1.0.3
-=======
-import doumeemes.core.model.LoginUserInfo;
->>>>>>> dev
import org.apache.shiro.authc.UsernamePasswordToken;
import org.springframework.stereotype.Component;
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
index 658ec95..a0363b0 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/CompanyLoginStatisticsVO.java
@@ -17,8 +17,6 @@
public class CompanyLoginStatisticsVO {
@ApiModelProperty(value = "鏃堕棿 yyyy-MM-dd")
-<<<<<<< HEAD
-<<<<<<< HEAD
@ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER,index = 0)
private String dataDate;
@@ -32,28 +30,6 @@
@ApiModelProperty(value = "鐧诲綍娆℃暟")
@ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER,index = 3)
-=======
- @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER)
-=======
- @ExcelColumn(name="鏃堕棿",width = 6,align = HorizontalAlignment.CENTER,index = 0)
->>>>>>> dev
- private String dataDate;
-
- @ApiModelProperty(value = "鐧诲綍浼佷笟鍚嶇О")
- @ExcelColumn(name="鐧诲綍浼佷笟鍚嶇О",width = 8,align = HorizontalAlignment.CENTER,index = 1)
- private String companyName;
-
- @ApiModelProperty(value = "娓犻亾")
- @ExcelColumn(name="娓犻亾", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER,index = 2)
- private Integer orgin;
-
- @ApiModelProperty(value = "鐧诲綍娆℃暟")
-<<<<<<< HEAD
- @ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER)
->>>>>>> 1.0.3
-=======
- @ExcelColumn(name="鐧诲綍娆℃暟",width = 6,align = HorizontalAlignment.CENTER,index = 3)
->>>>>>> dev
private Integer loginNum;
}
diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
index 846ba2d..423e65b 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -104,20 +104,4 @@
@ApiModelProperty(value = "鐧诲綍鏃堕棿")
@ExcelColumn(name="鐧诲綍鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
private Date loginTime;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
- @ApiModelProperty(value = "浼佷笟鍚嶇О")
- @ExcelColumn(name="浼佷笟鍚嶇О", color = IndexedColors.RED, width = 16)
- @TableField(exist = false)
- private String companyName;
-
- @ApiModelProperty(value = "浼佷笟鐢ㄦ埛鍚嶇О")
- @ExcelColumn(name="浼佷笟鐢ㄦ埛鍚嶇О", color = IndexedColors.RED, width = 16)
- @TableField(exist = false)
- private String companyUserName;
-
->>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
-=======
->>>>>>> 1.0.3
}
diff --git a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckAttrServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckAttrServiceImpl.java
index eaef60a..7b2836e 100644
--- a/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckAttrServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/WorkorderCheckAttrServiceImpl.java
@@ -183,7 +183,8 @@
for(int i=0;i<attrList.size();i++){
WorkorderCheckAttr wa=attrList.get(i);
CheckAttr attr = checkAttrExtMapper.selectById(wa.getAttrId()) ;
- if(attr == null || !Constants.equalsInteger(attr.getRootDepartId(),mp.getRootDepartId())|| !Constants.equalsInteger(attr.getProcedureId(),mp.getProcedureId())){
+// if(attr == null || !Constants.equalsInteger(attr.getRootDepartId(),mp.getRootDepartId())|| !Constants.equalsInteger(attr.getProcedureId(),mp.getProcedureId())){
+ if(attr == null || !Constants.equalsInteger(attr.getRootDepartId(),mp.getRootDepartId())){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勬鐐瑰睘鎬э紒");
}
if( Constants.equalsInteger(attr.getIsRequired(),Constants.ONE) && StringUtils.isBlank(wa.getVal())){
diff --git a/server/src/main/java/doumeemes/service/ext/impl/CheckAttrExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/CheckAttrExtServiceImpl.java
index f43ded3..4b85002 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/CheckAttrExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/CheckAttrExtServiceImpl.java
@@ -107,7 +107,7 @@
if(query.getWorkOrderID()!=null){
Workorder workorder= workorderServiceimpl.findById(query.getWorkOrderID());
if(workorder!=null){
- query.setProcedureId(workorder.getProcedureId());
+// query.setProcedureId(workorder.getProcedureId());
}else{
// return ApiResponse.failed("宸ュ崟涓嶅瓨鍦�");
}
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
index f094941..4d4d15b 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -235,9 +235,9 @@
.eq("MATERIAL_ID",w.getMaterialId())
.eq("DEPART_ID",w.getDepartId())
.eq("DELETED",Constants.ZERO)
- .eq("STATUS",Constants.ONE)
+// .eq("STATUS",Constants.ONE)
);
- w.setPapercode(b.getPapercode());
+ w.setPapercode(b!=null?b.getPapercode():null);
/* RouteProcedure currentRouteProcedure = routeProcedureExtMapper.selectOne(new QueryWrapper<RouteProcedure>()
.eq("ROUTE_ID",b.getRouteId())
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
index 81e09f4..ed3ee89 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java
@@ -137,14 +137,6 @@
for(WorkorderRecordExtListVO model : result){
//鏌ヨ鐢熶骇浜哄憳濮撳悕
initProUser(user,model,allDepartList);
-<<<<<<< HEAD
-// BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
-// s.divide(new BigDecimal(0),2);
-// model.setSalary(s.doubleValue());
-=======
-// int s= Constants.formatIntegerNum(model.getSalary());
-// model.setSalaryYuan(new BigDecimal(s).divide(new BigDecimal(100),2));
->>>>>>> dev
}
}
return PageData.from(new PageInfo<>(result));
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
index 456d431..a3c21da 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
@@ -4,14 +4,7 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
-<<<<<<< HEAD
-<<<<<<< HEAD
import doumeemes.core.utils.DateUtil;
-=======
->>>>>>> 1.0.3
-=======
-import doumeemes.core.utils.DateUtil;
->>>>>>> dev
import doumeemes.dao.ext.dto.ActivityLoginDTO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.vo.ActivityLoginVO;
@@ -205,18 +198,9 @@
@Override
public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
-<<<<<<< HEAD
-<<<<<<< HEAD
if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
}
-=======
->>>>>>> 1.0.3
-=======
- if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
- activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
- }
->>>>>>> dev
return systemUserMapper.activityLoginVOList(activityLoginDTO);
}
--
Gitblit v1.9.3