From bb7c0d979cc614e1e28f2a56cf75fc4b905edb97 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 09:58:14 +0800
Subject: [PATCH] deleted string改为int
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 1
ycl-server/src/main/java/com/ycl/task/ContractResultTask.java | 1
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 1
ycl-server/src/main/java/com/ycl/platform/service/impl/VehicleDataMonitorServiceImpl.java | 1
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java | 4
ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java | 10 +-
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TPlatform.java | 6
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResultRecord.java | 2
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 8
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 1
ycl-server/src/main/resources/mapper/system/SysRoleMapper.xml | 44 ++++----
ycl-server/src/main/resources/mapper/system/SysUserMapper.xml | 54 +++++-----
ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java | 8
ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java | 8
ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml | 12 +-
ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java | 2
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 12 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java | 1
ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java | 2
ycl-server/src/main/resources/mapper/system/SysMenuMapper.xml | 34 +++---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 3
ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml | 2
ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml | 6
ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml | 6
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java | 4
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/VehicleDataMonitor.java | 6
ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml | 6
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 3
ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java | 2
34 files changed, 128 insertions(+), 132 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java
index 68e682f..8d085d2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java
@@ -30,6 +30,6 @@
/** 閫昏緫鍒犻櫎 */
@TableField(value = "deleted", fill = FieldFill.INSERT)
- private String deleted;
+ private Integer deleted;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
index ed037d6..be4a641 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java
@@ -14,7 +14,7 @@
/**
* 鑰冩牳瑙勫垯瀵硅薄 t_check_rule
- *
+ *
* @author ruoyi
* @date 2024-04-15
*/
@@ -52,7 +52,7 @@
/** 閫昏緫鍒犻櫎 */
@Excel(name = "閫昏緫鍒犻櫎")
- private String deleted;
+ private Integer deleted;
/** 鍥炬爣 */
@Excel(name = "icon")
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
index 1bed2e7..da73ac4 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
@@ -13,7 +13,7 @@
/**
* 鑰冩牳妯℃澘瀵硅薄 t_check_template
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
@@ -76,7 +76,7 @@
private Date updateTime;
/** 閫昏緫鍒犻櫎 */
- private String deleted;
+ private Integer deleted;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
index aabaee5..4160aca 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResult.java
@@ -42,7 +42,7 @@
private Date checkTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
private Date updateTime;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResultRecord.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResultRecord.java
index f93b8ab..ef3a933 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResultRecord.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractResultRecord.java
@@ -27,6 +27,6 @@
private BigDecimal score;
private Date createTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
index 190042a..27f0087 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/ContractScore.java
@@ -84,7 +84,7 @@
private Date updateTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
//鏌ヨ鏉′欢
@TableField(exist = false)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
index 92bab73..26f4ee1 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TContract.java
@@ -84,7 +84,7 @@
private Date updateTime;
@TableLogic
- private String deleted;
+ private Integer deleted;
@TableField(exist = false)
@NotBlank
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TPlatform.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TPlatform.java
index 6618bb5..70b75e2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TPlatform.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/TPlatform.java
@@ -53,7 +53,7 @@
/**
* 閫昏緫鍒犻櫎锛�0鏈垹闄� 1鍒犻櫎
*/
- private String deleted;
+ private Integer deleted;
public void setId(Long id) {
this.id = id;
@@ -103,11 +103,11 @@
return status;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
- public String getDeleted() {
+ public Integer getDeleted() {
return deleted;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/VehicleDataMonitor.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/VehicleDataMonitor.java
index 9ad0356..badb6b3 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/VehicleDataMonitor.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/VehicleDataMonitor.java
@@ -59,7 +59,7 @@
* 閫昏緫鍒犻櫎
*/
@TableLogic
- private String deleted;
+ private Integer deleted;
public void setId(Integer id) {
this.id = id;
@@ -117,11 +117,11 @@
return notUniqueDataNumber;
}
- public void setDeleted(String deleted) {
+ public void setDeleted(Integer deleted) {
this.deleted = deleted;
}
- public String getDeleted() {
+ public Integer getDeleted() {
return deleted;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
index 994f23a..874f6d5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
@@ -153,7 +153,7 @@
* 閫昏緫鍒犻櫎锛�0鏈垹闄� 1鍒犻櫎
*/
@TableField("deleted")
- private String deleted;
+ private Integer deleted;
/*---------------------------- 鍏叡 ----------------------------------------------*/
/** 璁惧娲昏穬鐜囧伐鍗曢槇鍊� */
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
index 6cd1fac..db32b02 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
@@ -63,7 +63,7 @@
private String updateUserName;
/** 閫昏緫鍒犻櫎 */
- private String deleted;
+ private Integer deleted;
/** 鍒涘缓鑰� */
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java
index 8e496ec..ca7956c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java
@@ -38,7 +38,7 @@
@Excel(name = "鑰冩牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
- private String deleted;
+ private Integer deleted;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index c7c4157..f8561fa 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -26,6 +26,9 @@
/** 宸ュ崟鍙� */
private String workOrderNo;
+ /** 鐘舵�� */
+ private String status;
+
/** 杩愮淮鍗曚綅 */
private Integer unitId;
private String unitName;
diff --git a/ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java b/ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java
index ea523b4..162be7d 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/entity/SysDept.java
@@ -12,7 +12,7 @@
/**
* 閮ㄩ棬琛� sys_dept
- *
+ *
* @author ruoyi
*/
public class SysDept extends BaseEntity
@@ -49,11 +49,11 @@
private String status;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
+ private Integer delFlag;
/** 鐖堕儴闂ㄥ悕绉� */
private String parentName;
-
+
/** 瀛愰儴闂� */
private List<SysDept> children = new ArrayList<SysDept>();
@@ -161,12 +161,12 @@
this.status = status;
}
- public String getDelFlag()
+ public Integer getDelFlag()
{
return delFlag;
}
- public void setDelFlag(String delFlag)
+ public void setDelFlag(Integer delFlag)
{
this.delFlag = delFlag;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java b/ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java
index 36bbebe..ddc3aba 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/entity/SysRole.java
@@ -10,7 +10,7 @@
/**
* 瑙掕壊琛� sys_role
- *
+ *
* @author ruoyi
*/
public class SysRole extends BaseEntity
@@ -42,7 +42,7 @@
private String status;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
+ private Integer delFlag;
/** 鐢ㄦ埛鏄惁瀛樺湪姝よ鑹叉爣璇� 榛樿涓嶅瓨鍦� */
private boolean flag = false;
@@ -161,12 +161,12 @@
this.status = status;
}
- public String getDelFlag()
+ public Integer getDelFlag()
{
return delFlag;
}
- public void setDelFlag(String delFlag)
+ public void setDelFlag(Integer delFlag)
{
this.delFlag = delFlag;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java b/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
index 97f0258..d940ce4 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
@@ -12,7 +12,7 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
public class SysUser extends BaseEntity
@@ -50,7 +50,7 @@
private String status;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
+ private Integer delFlag;
/** 鏈�鍚庣櫥褰旾P */
private String loginIp;
@@ -211,12 +211,12 @@
this.status = status;
}
- public String getDelFlag()
+ public Integer getDelFlag()
{
return delFlag;
}
- public void setDelFlag(String delFlag)
+ public void setDelFlag(Integer delFlag)
{
this.delFlag = delFlag;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index 883a9e7..7eee993 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -215,8 +215,7 @@
job.setJobGroup("CHECK");
jobService.deleteJob(job);
}
- return checkTemplateMapper.updateCheckTemplate(new CheckTemplate().setId(id)
- .setDeleted(CheckConstants.Delete));
+ return checkTemplateMapper.updateCheckTemplate(new CheckTemplate().setId(id));
}
@Override
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
index f0e76b0..9b9ebef 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
@@ -63,7 +63,6 @@
contractScore.setCreateUserId(user.getUserId());
contractScore.setCreateUser(user.getNickName());
contractScore.setAuditingStatus(AuditingStatus.WAIT);
- contractScore.setDeleted("0");
contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
List<CalculateRule> list = new LambdaQueryChainWrapper<>(calculateRuleMapper).in(CalculateRule::getId, contractScore.getRuleIdsArray()).list();
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
index b48b540..9182297 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TContractServiceImpl.java
@@ -134,7 +134,6 @@
public AjaxResult importData(MultipartFile file, TContract tContract) {
// 淇濆瓨鍚堝悓
tContract.setCreateTime(DateUtils.getNowDate());
- tContract.setDeleted("0");
save(tContract);
List<CalculateRule> list = calculateRuleService.readExcel(file);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/VehicleDataMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/VehicleDataMonitorServiceImpl.java
index 58251ba..870aa48 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/VehicleDataMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/VehicleDataMonitorServiceImpl.java
@@ -52,7 +52,6 @@
@Override
public int insertVehicleDataMonitor(VehicleDataMonitor vehicleDataMonitor) {
vehicleDataMonitor.setCreateTime(DateUtils.getNowDate());
- vehicleDataMonitor.setDeleted("0");
return vehicleDataMonitorMapper.insertVehicleDataMonitor(vehicleDataMonitor);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 053279c..03e14a0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -77,7 +77,6 @@
entity.setWorkOrderNo(DateUtils.dateTimeNow());
entity.setCreateTime(DateUtils.getNowDate());
entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
- entity.setDeleted("0");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index a362ac8..549199d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -91,7 +91,6 @@
sysUser.setUserName(form.getYwPersonAccount());
sysUser.setPassword(SecurityUtils.encryptPassword("123456"));
sysUser.setStatus("0");
- sysUser.setDelFlag("0");
sysUser.setFirstLogin((short) 0);
sysUser.setNickName(form.getYwPersonName());
}
diff --git a/ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java b/ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java
index 139cda2..263aabc 100644
--- a/ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java
+++ b/ycl-server/src/main/java/com/ycl/plus/CustomMetaObjectHandler.java
@@ -28,7 +28,7 @@
this.setFieldValByName("createTime", new Date(), metaObject);
this.setFieldValByName("createUser", username, metaObject);
this.setFieldValByName("createBy", username, metaObject);
- this.setFieldValByName("deleted", "0", metaObject);
+ this.setFieldValByName("deleted", 0, metaObject);
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
index d1b5021..e15e890 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
@@ -88,7 +88,6 @@
contractResult.setUnitId(tContract.getUnitId());
contractResult.setContractId(tContract.getId());
contractResult.setPublish(0);
- contractResult.setDeleted("0");
contractResult.setCheckTime(DateUtils.getNowDate());
contractResult.setScore(contractScore.isEmpty() ? new BigDecimal("100") : new BigDecimal("100").subtract(contractScore.stream().map(ContractScore::getScore).reduce(BigDecimal::add).get()));
return contractResult;
diff --git a/ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml b/ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml
index e2aecb8..876e4e0 100644
--- a/ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ycl-server/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -30,7 +30,7 @@
<select id="selectDeptList" parameterType="com.ycl.system.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
- where d.del_flag = '0'
+ where d.del_flag = 0
<if test="deptId != null and deptId != 0">
AND dept_id = #{deptId}
</if>
@@ -67,12 +67,12 @@
</select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int">
- select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+ select count(1) from sys_user where dept_id = #{deptId} and del_flag = 0
</select>
<select id="hasChildByDeptId" parameterType="Long" resultType="int">
select count(1) from sys_dept
- where del_flag = '0' and parent_id = #{deptId} limit 1
+ where del_flag = 0 and parent_id = #{deptId} limit 1
</select>
<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
@@ -80,12 +80,12 @@
</select>
<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
- select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
+ select count(*) from sys_dept where status = '0' and del_flag = 0 and find_in_set(#{deptId}, ancestors)
</select>
<select id="checkDeptNameUnique" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
- where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
+ where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = 0 limit 1
</select>
<insert id="insertDept" parameterType="com.ycl.system.entity.SysDept">
@@ -159,7 +159,7 @@
</delete>
<select id="cascader" resultType="com.ycl.platform.base.Cascader">
- SELECT dept_id as value, dept_name as label, parent_id as parentId FROM sys_dept WHERE status = '0' AND del_flag = '0'
+ SELECT dept_id as value, dept_name as label, parent_id as parentId FROM sys_dept WHERE status = '0' AND del_flag = 0
</select>
<select id="selectParents" resultType="long">
diff --git a/ycl-server/src/main/resources/mapper/system/SysMenuMapper.xml b/ycl-server/src/main/resources/mapper/system/SysMenuMapper.xml
index 38f80ed..4673ba9 100644
--- a/ycl-server/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ycl-server/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -28,10 +28,10 @@
</resultMap>
<sql id="selectMenuVo">
- select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
+ select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
from sys_menu
</sql>
-
+
<select id="selectMenuList" parameterType="com.ycl.system.entity.SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
<where>
@@ -47,13 +47,13 @@
</where>
order by parent_id, order_num
</select>
-
+
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
- from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
+ from sys_menu m where m.menu_type in ('M', 'C') and m.status = '0'
order by m.parent_id, m.order_num
</select>
-
+
<select id="selectMenuListByUserId" parameterType="com.ycl.system.entity.SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
@@ -72,7 +72,7 @@
</if>
order by m.parent_id, m.order_num
</select>
-
+
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
@@ -80,10 +80,10 @@
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
left join sys_user u on ur.user_id = u.user_id
- where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
+ where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = '0' AND ro.status = 0
order by m.parent_id, m.order_num
</select>
-
+
<select id="selectMenuListByRoleId" resultType="Long">
select m.menu_id
from sys_menu m
@@ -94,7 +94,7 @@
</if>
order by m.parent_id, m.order_num
</select>
-
+
<select id="selectMenuPerms" resultType="String">
select distinct m.perms
from sys_menu m
@@ -110,28 +110,28 @@
left join sys_role r on r.role_id = ur.role_id
where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
</select>
-
+
<select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
select distinct m.perms
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
where m.status = '0' and rm.role_id = #{roleId}
</select>
-
+
<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_id = #{menuId}
</select>
-
+
<select id="hasChildByMenuId" resultType="Integer">
- select count(1) from sys_menu where parent_id = #{menuId}
+ select count(1) from sys_menu where parent_id = #{menuId}
</select>
-
+
<select id="checkMenuNameUnique" parameterType="com.ycl.system.entity.SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_name=#{menuName} and parent_id = #{parentId} limit 1
</select>
-
+
<update id="updateMenu" parameterType="com.ycl.system.entity.SysMenu">
update sys_menu
<set>
@@ -194,9 +194,9 @@
sysdate()
)
</insert>
-
+
<delete id="deleteMenuById" parameterType="Long">
delete from sys_menu where menu_id = #{menuId}
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/system/SysRoleMapper.xml b/ycl-server/src/main/resources/mapper/system/SysRoleMapper.xml
index d1a41e8..659f129 100644
--- a/ycl-server/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ycl-server/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -20,19 +20,19 @@
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
-
+
<sql id="selectRoleVo">
select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
- r.status, r.del_flag, r.create_time, r.remark
+ r.status, r.del_flag, r.create_time, r.remark
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id
left join sys_dept d on u.dept_id = d.dept_id
</sql>
-
+
<select id="selectRoleList" parameterType="com.ycl.system.entity.SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- where r.del_flag = '0'
+ where r.del_flag = 0
<if test="roleId != null and roleId != 0">
AND r.role_id = #{roleId}
</if>
@@ -55,16 +55,16 @@
${params.dataScope}
order by r.role_sort
</select>
-
+
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- WHERE r.del_flag = '0' and ur.user_id = #{userId}
+ WHERE r.del_flag = 0 and ur.user_id = #{userId}
</select>
-
+
<select id="selectRoleAll" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
</select>
-
+
<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
select r.role_id
from sys_role r
@@ -72,29 +72,29 @@
left join sys_user u on u.user_id = ur.user_id
where u.user_id = #{userId}
</select>
-
+
<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.role_id = #{roleId}
</select>
-
+
<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- WHERE r.del_flag = '0' and u.user_name = #{userName}
+ WHERE r.del_flag = 0 and u.user_name = #{userName}
</select>
-
+
<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- where r.role_name=#{roleName} and r.del_flag = '0' limit 1
+ where r.role_name=#{roleName} and r.del_flag = 0 limit 1
</select>
-
+
<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
- where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
+ where r.role_key=#{roleKey} and r.del_flag = 0 limit 1
</select>
<select id="selectRoleByKey" resultType="com.ycl.system.entity.SysRole">
- select * from sys_role where role_key = #{roleKey} and del_flag = '0' limit 1
+ select * from sys_role where role_key = #{roleKey} and del_flag = 0 limit 1
</select>
<insert id="insertRole" parameterType="com.ycl.system.entity.SysRole" useGeneratedKeys="true" keyProperty="roleId">
@@ -124,7 +124,7 @@
sysdate()
)
</insert>
-
+
<update id="updateRole" parameterType="com.ycl.system.entity.SysRole">
update sys_role
<set>
@@ -141,16 +141,16 @@
</set>
where role_id = #{roleId}
</update>
-
+
<delete id="deleteRoleById" parameterType="Long">
update sys_role set del_flag = '2' where role_id = #{roleId}
</delete>
-
+
<delete id="deleteRoleByIds" parameterType="Long">
update sys_role set del_flag = '2' where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
- </foreach>
+ </foreach>
</delete>
-
-</mapper>
\ No newline at end of file
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml b/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
index 194c2b2..08466cf 100644
--- a/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -27,7 +27,7 @@
<association property="dept" javaType="com.ycl.system.entity.SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
-
+
<resultMap id="deptResult" type="com.ycl.system.entity.SysDept">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
@@ -37,7 +37,7 @@
<result property="leader" column="leader" />
<result property="status" column="dept_status" />
</resultMap>
-
+
<resultMap id="RoleResult" type="com.ycl.system.entity.SysRole">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
@@ -46,7 +46,7 @@
<result property="dataScope" column="data_scope" />
<result property="status" column="role_status" />
</resultMap>
-
+
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.first_login,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
@@ -56,11 +56,11 @@
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
</sql>
-
+
<select id="selectUserList" parameterType="com.ycl.system.entity.SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
- where u.del_flag = '0'
+ where u.del_flag = 0
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
</if>
@@ -85,14 +85,14 @@
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
-
+
<select id="selectAllocatedList" parameterType="com.ycl.system.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and r.role_id = #{roleId}
+ where u.del_flag = 0 and r.role_id = #{roleId}
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
</if>
@@ -102,14 +102,14 @@
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
-
+
<select id="selectUnallocatedList" parameterType="com.ycl.system.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
+ where u.del_flag = 0 and (r.role_id != #{roleId} or r.role_id IS NULL)
and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
@@ -120,27 +120,27 @@
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
-
+
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
- where u.user_name = #{userName} and u.del_flag = '0'
+ where u.user_name = #{userName} and u.del_flag = 0
</select>
-
+
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
</select>
-
+
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
+ select user_id, user_name from sys_user where user_name = #{userName} and del_flag = 0 limit 1
</select>
-
+
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
+ select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = 0 limit 1
</select>
-
+
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
+ select user_id, email from sys_user where email = #{email} and del_flag = 0 limit 1
</select>
<select id="selectUserIdByNames" resultType="java.lang.Long">
@@ -181,7 +181,7 @@
sysdate()
)
</insert>
-
+
<update id="updateUser" parameterType="com.ycl.system.entity.SysUser">
update sys_user
<set>
@@ -202,28 +202,28 @@
</set>
where user_id = #{userId}
</update>
-
+
<update id="updateUserStatus" parameterType="com.ycl.system.entity.SysUser">
update sys_user set status = #{status} where user_id = #{userId}
</update>
-
+
<update id="updateUserAvatar" parameterType="com.ycl.system.entity.SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
-
+
<update id="resetUserPwd" parameterType="com.ycl.system.entity.SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
-
+
<delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId}
</delete>
-
+
<delete id="deleteUserByIds" parameterType="Long">
update sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
- </foreach>
+ </foreach>
</delete>
-
-</mapper>
\ No newline at end of file
+
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
index 9ff0965..5d46ac7 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractResultMapper.xml
@@ -9,11 +9,11 @@
ct.name AS contractName
FROM t_contract_result c
LEFT JOIN
- t_yw_unit u ON c.unit_id = u.id and u.deleted = '0'
+ t_yw_unit u ON c.unit_id = u.id and u.deleted = 0
LEFT JOIN
- t_contract ct ON c.contract_id = ct.id and ct.deleted = '0'
+ t_contract ct ON c.contract_id = ct.id and ct.deleted = 0
where
- c.deleted = '0'
+ c.deleted = 0
<if test="unitId != null">
AND c.unit_id = #{unitId}
</if>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
index e4ca7ab..92dee79 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ContractScoreMapper.xml
@@ -30,11 +30,11 @@
FROM
t_contract_score cs
LEFT JOIN
- t_yw_unit u ON cs.unit_id = u.id and u.deleted = '0'
+ t_yw_unit u ON cs.unit_id = u.id and u.deleted = 0
LEFT JOIN
- t_contract c ON cs.contract_id = c.id and c.deleted = '0'
+ t_contract c ON cs.contract_id = c.id and c.deleted = 0
where
- cs.deleted = '0'
+ cs.deleted = 0
<if test="unitId != null">
AND cs.unit_id = #{unitId}
</if>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index d6d1b62..a6bac16 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -21,11 +21,11 @@
r.*, u.unit_name, p.yw_person_name as peopleName, pt.point_name
FROM
t_report r
- LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = '0'
- LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = '0'
- LEFT JOIN t_yw_point pt ON r.point_id = pt.id and pt.deleted = '0'
+ LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
+ LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = 0
+ LEFT JOIN t_yw_point pt ON r.point_id = pt.id and pt.deleted = 0
where
- r.deleted = '0'
+ r.deleted = 0
<if test="query.reportType != null and query.reportType != ''">
AND r.report_type = #{query.reportType}
</if>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
index 4e2abe7..f0fd939 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TContractMapper.xml
@@ -7,9 +7,9 @@
<select id="selectAll" resultType="com.ycl.platform.domain.entity.TContract">
select a.*, b.unit_name
from t_contract a
- left join t_yw_unit b on a.unit_id = b.id and b.deleted = '0'
- where a.deleted = '0'
+ left join t_yw_unit b on a.unit_id = b.id and b.deleted = 0
+ where a.deleted = 0
order by create_time desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 478d8ff..e4cd9e1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -22,10 +22,10 @@
p.yw_person_name
FROM
t_work_order wo
- LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = '0'
- LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
+ LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
where
- wo.deleted = '0'
+ wo.deleted = 0
<if test="query.workOrderNo != null and query.workOrderNo != ''">
AND wo.work_order_no = #{query.workOrderNo}
</if>
@@ -48,10 +48,10 @@
p.yw_person_name
FROM
t_work_order wo
- LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = '0'
- LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
+ LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
where
- wo.deleted = '0'
+ wo.deleted = 0
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
</if>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
index 2f40ff3..d8b6c6e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
@@ -15,7 +15,7 @@
<select id="selectYwConditionByYwId" resultMap="BaseResultMap">
SELECT yw.id, yw.commit_user, yw.yw_condition, yw.yw_proofMaterials, yw.create_time, su.nick_name
FROM t_work_order_yw_condition_record yw
- INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0
+ INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_id = #{workOrderId}
ORDER BY yw.create_time DESC
</select>
--
Gitblit v1.8.0