Skip to content

T
tianjin-cement
Commit c8a1cd13 authored by 竹天卫's avatar 竹天卫
Browse files
Options

设备 和 标样 过期库存提示标识

parent 080969e5
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java
View file @ c8a1cd13
...@@ -40,9 +40,9 @@ public class WeiXinController { ...@@ -40,9 +40,9 @@ public class WeiXinController {
log.debug("============================================="); log.debug("=============================================");
try { try {
//测试服务器 //测试服务器
return weiXinService.getTestToken(code); // return weiXinService.getTestToken(code);
//正式服务器 //正式服务器
// return weiXinService.getToken(code, "APP"); return weiXinService.getToken(code, "APP");
} catch (Exception e) { } catch (Exception e) {
log.debug("获取登录token{}", e); log.debug("获取登录token{}", e);
} }
...@@ -54,9 +54,9 @@ public class WeiXinController { ...@@ -54,9 +54,9 @@ public class WeiXinController {
public BaseResponse getPCToken(String code) { public BaseResponse getPCToken(String code) {
try { try {
//测试服务器 //测试服务器
return weiXinService.getTestToken(code); // return weiXinService.getTestToken(code);
//正式服务器 //正式服务器
// return weiXinService.getToken(code, "PC"); return weiXinService.getToken(code, "PC");
} catch (Exception e) { } catch (Exception e) {
log.debug("获取登录token{}", e); log.debug("获取登录token{}", e);
} }
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EquipmentVo.java
View file @ c8a1cd13
...@@ -98,7 +98,7 @@ public class EquipmentVo { ...@@ -98,7 +98,7 @@ public class EquipmentVo {
private String supplierName; private String supplierName;
@ApiModelProperty("到期状态（0展示标识：表示即将过期，1不展示标识：正常显示）") @ApiModelProperty("到期状态（1展示标识：表示即将过期，0不展示标识：正常显示）")
private Integer isDate; private Integer isDate;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/StandardVo.java
View file @ c8a1cd13
...@@ -78,10 +78,10 @@ public class StandardVo { ...@@ -78,10 +78,10 @@ public class StandardVo {
@ApiModelProperty("产地") @ApiModelProperty("产地")
private String origin; private String origin;
@ApiModelProperty("库存状态（0展示标识：表示库存数量小于最小值，1不展示标识：正常显示）") @ApiModelProperty("库存状态（1展示标识：表示库存数量小于最小值，0不展示标识：正常显示）")
private Integer isStock; private Integer isStock;
@ApiModelProperty("到期状态（0展示标识：表示即将过期，1不展示标识：正常显示）") @ApiModelProperty("到期状态（1展示标识：表示即将过期，0不展示标识：正常显示）")
private Integer isDate; private Integer isDate;
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java
View file @ c8a1cd13
...@@ -101,15 +101,15 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment ...@@ -101,15 +101,15 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
//如果当前日期等于检定到期日期 或者 当前日期大于检定到期日期，提示设备检定人员检定设备 //如果当前日期等于检定到期日期 或者 当前日期大于检定到期日期，提示设备检定人员检定设备
if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){ if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){ if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
eq.setIsDate(0); //展示期标识 eq.setIsDate(1); //展示期标识
}else{ }else{
eq.setIsDate(1); //不展示期标识 eq.setIsDate(0); //不展示期标识
} }
}else{ }else{
eq.setIsDate(1); //不展示期标识 eq.setIsDate(0); //不展示期标识
} }
}else{ }else{
eq.setIsDate(1); //不展示期标识 eq.setIsDate(0); //不展示期标识
} }
} }
return BaseResponse.okData(pages); return BaseResponse.okData(pages);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java
View file @ c8a1cd13
...@@ -116,24 +116,24 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i ...@@ -116,24 +116,24 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
for(StandardVo st : standardList){ for(StandardVo st : standardList){
if(st.getLeastNum() != null && st.getStockNum() != null){ if(st.getLeastNum() != null && st.getStockNum() != null){
if(st.getStockNum().compareTo(st.getLeastNum())<1){ if(st.getStockNum().compareTo(st.getLeastNum())<1){
st.setIsStock(0); //展示库标识 st.setIsStock(1); //展示库标识
}else{ }else{
st.setIsStock(1); //不展示库标识 st.setIsStock(0); //不展示库标识
} }
}else{ }else{
st.setIsStock(1); //不展示库标识 st.setIsStock(0); //不展示库标识
} }
if(st.getValidDate() != null){ if(st.getValidDate() != null){
LocalDate expireDate = st.getValidDate().minusDays(15); LocalDate expireDate = st.getValidDate().minusDays(15);
if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){ if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
st.setIsDate(0); //展示期标识 st.setIsDate(1); //展示期标识
}else{ }else{
st.setIsDate(1); //不展示期标识 st.setIsDate(0); //不展示期标识
} }
}else{ }else{
st.setIsDate(1); //不展示期标识 st.setIsDate(0); //不展示期标识
} }
} }
......
cement-business/src/main/resources/application.yml
View file @ c8a1cd13
...@@ -8,9 +8,9 @@ spring: ...@@ -8,9 +8,9 @@ spring:
active: dev active: dev
datasource: datasource:
# 192.168.110.85 admin!@#123 sinoma_zhengshiData sinoma_tmp # 192.168.110.85 admin!@#123 sinoma_zhengshiData sinoma_tmp
url: jdbc:mysql://192.168.110.85:3306/sinoma_zhengshiData?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false # url: jdbc:mysql://192.168.110.85:3306/sinoma_zhengshiData?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
# url: jdbc:mysql://192.168.110.85:3306/sinoma_bangye?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false # url: jdbc:mysql://192.168.110.85:3306/sinoma_bangye?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
# url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root username: root
password: admin!@#123 password: admin!@#123
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
...@@ -41,30 +41,30 @@ mybatis-plus: ...@@ -41,30 +41,30 @@ mybatis-plus:
mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
#正式服务器 #正式服务器
#weixin: weixin:
# corpId: wwc7ae84e6af6ba921 corpId: wwc7ae84e6af6ba921
# agentIdPC: 1000151 agentIdPC: 1000151
# agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
# agentId: 1000150 agentId: 1000150
# agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
# backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
# backOrcUrl: https://ccdcmtl.sinoma-tianjin.com/lab-system backOrcUrl: https://ccdcmtl.sinoma-tianjin.com/lab-system
# systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=U_R_L&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,' systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=U_R_L&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
# 原始链接备份 # 原始链接备份
# systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,' # systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
#测试服务器 #测试服务器
weixin: #weixin:
corpId: ww348f91b2573c1867 # corpId: ww348f91b2573c1867
agentId: 1000002 # agentId: 1000002
agentIdPC: 1000003 # agentIdPC: 1000003
agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o # agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A # agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
backUrl: https%3a%2f%2flab.wisenergy.cn%2flab-bangye # backUrl: https%3a%2f%2flab.wisenergy.cn%2flab-bangye
backOrcUrl: https://lab.wisenergy.cn/lab-bangye # backOrcUrl: https://lab.wisenergy.cn/lab-bangye
systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=U_R_L&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,' # systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=U_R_L&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
#邦业服务器 #邦业服务器
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment