FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4-12 审查流程入库页面展示

Browse Source
This commit is contained in:
yuezhihang
2022-04-12 17:40:20 +08:00
parent 362f82c639
commit f96714b0d2
10 changed files with 266 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+30 -4
View File
@@ -8,6 +8,7 @@ import com.adc.da.login.util.IDMUtil;
import com.adc.da.login.util.JwtUtils;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.service.IUserEOService;
import com.adc.da.util.Encodes;
import com.adc.da.util.PasswordUtils;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
@@ -17,10 +18,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import sun.misc.BASE64Encoder;
import javax.servlet.http.Cookie;
@@ -29,6 +27,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -78,6 +77,33 @@ public class LoginRestController {
}
}
@ApiOperation(value = "登录")
// @GetMapping(value = "/login")
@GetMapping(value = "/checkPage")
@ResponseBody
public ResponseMessage<String> checkPage(@RequestParam @NotNull(message = "请输入用户名") String username) throws UnsupportedEncodingException {
username =new String(Encodes.decodeBase64(username), StandardCharsets.UTF_8);
UserEO userEO = userService.getUserByLoginNameNotDeleted(username);
if (null == userEO) {
log.info("用户[{}]身份验证失败", username);
return Result.error("r0011", "您输入的帐号不存在");
}
if(userEO.getDisableFlag()==1){
log.info("用户[{}]身份验证失败", username);
return Result.error("r0011", "您输入的帐号已禁用");
}
String token = jwtUtils.generateToken(userEO.getUsid());
// 加密重要信息
BASE64Encoder encoder = new BASE64Encoder();
userEO.setToken(token);
String userStr = JSON.toJSONString(userEO);
String userStr2 = URLEncoder.encode(userStr,"UTF-8");
userStr = encoder.encode(userStr2.getBytes());
return Result.success(userStr);
}
@ApiOperation(value = "登录")
@PostMapping(value = "/loginIdm")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/ProductDeptIssueController.java
+3 -2
View File
@@ -53,7 +53,7 @@ public class ProductDeptIssueController {
@GetMapping
@ApiOperation("查询产品规划部重点问题")
public ResponseMessage<IPage<ProductDeptIssue>> getProductDeptIssue(@RequestParam ProductDeptIssueVo wrapper){
public ResponseMessage<IPage<ProductDeptIssue>> getProductDeptIssue(ProductDeptIssueVo wrapper){
IPage<ProductDeptIssue> issueList = iProductDeptIssueService.getProductDeptIssue(wrapper);
return Result.success(issueList);
}
@@ -64,7 +64,8 @@ public class ProductDeptIssueController {
boolean b = iProductDeptIssueService.updateProductDeptIssue(issue);
return Result.success(b);
}
// 多态对接口具有可替换性接口 灵活性简化性易拓展 可替换的概念可以理解伟方法可以被同类重用
// 可扩充性可以理解为该方法可以添加子类而不影响现有代码，接口性就是指的是向子类提供一个公用的高级接口子类来集成完善这个接口中的方法来实现要求。
@PostMapping("/closeProductIssue")
@ApiOperation("关闭产品规划部重点问题")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/BusinessDeptIssueDao.java
+2 -1
View File
@@ -15,5 +15,6 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface BusinessDeptIssueDao extends BaseMapper<BusinessDeptIssue> {
IPage<BusinessDeptIssue> findPage(IPage<BusinessDeptIssue> page, @Param(Constants.WRAPPER) QueryWrapper<BusinessDeptIssue> queryWrapper);
IPage<BusinessDeptIssue> findPage(IPage<BusinessDeptIssue> page, @Param(Constants.WRAPPER) QueryWrapper<BusinessDeptIssue> queryWrapper
,@Param("dept") String dept);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/ProductDeptIssueDao.java
+3 -1
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarStandUnqualified.dao;
import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue;
import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssueVo;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -11,5 +12,6 @@ import org.apache.ibatis.annotations.Param;
public interface ProductDeptIssueDao extends BaseMapper<ProductDeptIssue> {
public IPage<ProductDeptIssue> findPage(IPage<ProductDeptIssue> page,@Param(Constants.WRAPPER) QueryWrapper<ProductDeptIssue> wrapper);
public IPage<ProductDeptIssue> findPage1(IPage<ProductDeptIssue> page,@Param(Constants.WRAPPER) QueryWrapper<ProductDeptIssue> wrapper);
public IPage<ProductDeptIssue> findPage(IPage<ProductDeptIssue> page, @Param("ew") ProductDeptIssueVo objVo);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java
+69 -60
View File
@@ -19,82 +19,91 @@ import java.util.Date;
public class BusinessDeptIssue {
@ExcelIgnore
@TableId
private String id;
@ExcelIgnore
@TableId
private String id;
@ExcelIgnore
@TableField("law_id")
private String lawId;
@ExcelIgnore
@TableField("law_id")
private String lawId;
@ExcelProperty("标准号")
@TableField(exist = false)
private String lawNumber;
@ExcelProperty("标准号")
@TableField(exist = false)
private String lawNumber;
@ExcelProperty("标准名称")
@TableField(exist = false)
private String lawName;
@ExcelProperty("标准名称")
@TableField(exist = false)
private String lawName;
@ExcelProperty("产品类别")
@TableField("product_type")
private String productType;
@ExcelProperty("产品类别")
@TableField("product_type")
private String productType;
@ExcelProperty("实施实践")
@TableField("impl_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
private Date implTime;
@ExcelProperty("实施实践")
@TableField("impl_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
private Date implTime;
@ExcelProperty("实施要求")
@TableField("impl_require")
private String implRequire;
@ExcelProperty("实施要求")
@TableField("impl_require")
private String implRequire;
@ExcelProperty("资源符合状态")
@TableField("conform_situation")
private String conformSituation;
@ExcelProperty("资源符合状态")
@TableField("conform_situation")
private String conformSituation;
@ExcelProperty("开发情况")
@TableField("dev_scheme")
private String devScheme;
@ExcelProperty("开发情况")
@TableField("dev_scheme")
private String devScheme;
@ExcelProperty("sop时间")
@TableField("sop_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
private Date sopTime;
@ExcelProperty("sop时间")
@TableField("sop_time")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
private Date sopTime;
@ExcelProperty("完成情况")
@TableField("complete_situation")
private String completeSituation;
@ExcelProperty("完成情况")
@TableField("complete_situation")
private String completeSituation;
@ExcelProperty("超出sop时限后计划")
@TableField("timeout_situation")
private String timeoutSituation;
@ExcelProperty("超出sop时限后计划")
@TableField("timeout_situation")
private String timeoutSituation;
@ExcelIgnore
@TableLogic(value = "0",delval = "1")
@TableField("del_flag")
private String delFlag;
@ExcelIgnore
@TableLogic(value = "0", delval = "1")
@TableField("del_flag")
private String delFlag;
@ExcelProperty("责任部门")
@TableField("response_dept")
private String responseDept;
@ExcelProperty("责任部门")
@TableField("response_dept")
private String responseDept;
@ExcelProperty("责任人")
@TableField("response_people")
private String responsePeople;
@ExcelProperty("责任人")
@TableField("response_people")
private String responsePeople;
@ExcelIgnore
@TableField("is_close")
private String isClose;
@ExcelIgnore
@TableField("is_close")
private String isClose;
@ExcelIgnore
@TableField("is_risk")
private String isRisk;
@ExcelIgnore
@TableField("is_risk")
private String isRisk;
@ExcelIgnore
@TableField(exist = false)
private Integer page;
@ExcelIgnore
@TableField(exist = false)
private Integer page;
@ExcelIgnore
@TableField(exist = false)
private Integer pageSize;
@ExcelIgnore
@TableField(exist = false)
private Integer pageSize;
@TableField(exist = false)
private String responseInsId;
@TableField(exist = false)
private String responseInsName;
@TableField(exist = false)
private String responseUserName;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/ProductDeptIssue.java
+47 -38
View File
@@ -15,60 +15,69 @@ import java.util.Date;
@TableName("product_dept_issue")
public class ProductDeptIssue {
@TableId
private String id;
@TableId
private String id;
@TableField("law_id")
private String lawId;
@TableField("law_id")
private String lawId;
@TableField(exist = false)
private String lawsNumber;
@TableField(exist = false)
private String lawsNumber;
@TableField(exist = false)
private String lawsName;
@TableField(exist = false)
private String lawsName;
@TableField("product_business")
private String productBusiness;
@TableField("product_business")
private String productBusiness;
@TableField("platform")
private String platform;
@TableField("platform")
private String platform;
@TableField("poj_name")
private String pojName;
@TableField("poj_name")
private String pojName;
@TableField("poj_description")
private String pojDescription;
@TableField("poj_description")
private String pojDescription;
@TableField("current_node")
private String currentNode;
@TableField("current_node")
private String currentNode;
@TableField("conceptual_state")
private String conceptualState;
@TableField("conceptual_state")
private String conceptualState;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
@TableField("scheduled_issuance_time")
private Date scheduledIssuanceTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd")
@TableField("scheduled_issuance_time")
private Date scheduledIssuanceTime;
@TableField("revised_plan")
private String revisedPlan;
@TableField("revised_plan")
private String revisedPlan;
@TableField("explanation")
private String explanation;
@TableField("explanation")
private String explanation;
@TableField("response_dept")
private String responseDept;
@TableField("response_dept")
private String responseDept;
@TableLogic(value = "0",delval = "1")
@TableField("del_flag")
private String delFlag;
@TableLogic(value = "0", delval = "1")
@TableField("del_flag")
private String delFlag;
@TableField("is_close")
private String isClose;
@TableField("is_close")
private String isClose;
@TableField(exist = false)
private Integer page;
@TableField(exist = false)
private Integer page;
@TableField(exist = false)
private Integer pageSize;
@TableField(exist = false)
private Integer pageSize;
@TableField(exist = false)
private String responseInsId;
@TableField(exist = false)
private String responseInsName;
@TableField(exist = false)
private String responseUserName;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/BusinessDeptIssueService.java
+4 -4
View File
@@ -63,9 +63,9 @@ public class BusinessDeptIssueService extends ServiceImpl<BusinessDeptIssueDao,
wrapper.like("product_type",pageVo.getProductType());
}
if (pageVo.getResponseDept()!=null){
wrapper.like("response_dept",pageVo.getResponseDept());
}
// if (pageVo.getResponseDept()!=null){
// wrapper.like("response_dept",pageVo.getResponseDept());
// }
/**
* 导出
@@ -74,7 +74,7 @@ public class BusinessDeptIssueService extends ServiceImpl<BusinessDeptIssueDao,
wrapper.in("issue.ID",pageVo.getIdList());
}
page = businessDeptIssueDao.findPage(page, wrapper);
page = businessDeptIssueDao.findPage(page, wrapper,pageVo.getResponseDept());
return page;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/ProductDeptIssueService.java
+22 -22
View File
@@ -37,29 +37,29 @@ public class ProductDeptIssueService extends ServiceImpl<ProductDeptIssueDao,Pro
@Override
public IPage<ProductDeptIssue> getProductDeptIssue(ProductDeptIssueVo objVo) {
IPage<ProductDeptIssue> page=new Page<>(objVo.getPage(),objVo.getPage());
IPage<ProductDeptIssue> page=new Page<>(objVo.getPage(),objVo.getPageSize());
QueryWrapper<ProductDeptIssue> wrapper = new QueryWrapper<>();
//查询条件
if (objVo.getIsClose()!=null){
wrapper.like("is_close",objVo.getIsClose());
}
if (objVo.getLawsNumber()!=null){
wrapper.like("laws.LAWS_NAME",objVo.getLawsName())
.or()
.like("laws.LAWS_NUMBER",objVo.getLawsNumber());
}
if (objVo.getPojName()!=null){
wrapper.like("poj_name",objVo.getPojName());
}
if (objVo.getResponseDept()!=null){
wrapper.like("response_dept",objVo.getResponseDept());
}
productDeptIssueDao.findPage(page,wrapper);
// QueryWrapper<ProductDeptIssue> wrapper = new QueryWrapper<>();
// //查询条件
// if (objVo.getIsClose()!=null){
// wrapper.like("is_close",objVo.getIsClose());
// }
//
//
// if (objVo.getLawsNumber()!=null){
// wrapper.like("laws.LAWS_NAME",objVo.getLawsName())
// .or()
// .like("laws.LAWS_NUMBER",objVo.getLawsNumber());
// }
//
// if (objVo.getPojName()!=null){
// wrapper.like("poj_name",objVo.getPojName());
// }
//
// if (objVo.getResponseDept()!=null){
// wrapper.like("response_dept",objVo.getResponseDept());
// }
productDeptIssueDao.findPage(page,objVo);
return page;
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/BusinessDeptIssuempaaer.xml
+21 -4
View File
@@ -23,22 +23,32 @@
<select id="findPage" resultMap="BusinessIssuePage">
select t.* from (
SELECT
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
business_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws
ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_people
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
${ew.customSqlSegment}
UNION ALL
SELECT
issue.*,
laws.STAND_CODE AS lawNumber,
laws.STAND_NAME AS lawName
laws.STAND_NAME AS lawName,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
business_dept_issue AS issue
LEFT JOIN sar_bussioness_stand AS laws
ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_people
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
${ew.customSqlSegment}
UNION ALL
@@ -50,15 +60,22 @@
'-',
laws.STAND_YEAR
) AS lawNumber,
laws.STAND_NAME AS lawName
laws.STAND_NAME AS lawName,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
business_dept_issue AS issue
LEFT JOIN sar_standards_info AS laws
ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_people
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
${ew.customSqlSegment}
) t
where t.LAWS_NAME is not null and t.LAWS_NUMBER is not null
<if test="null != dept and dept != ''">
and t.responseInsName like concat('%',#{dept},'%')
</if>
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/ProductDeptIssuempaaer.xml
+65 -5
View File
@@ -21,12 +21,72 @@
<select id="findPage" resultMap="ProductIssuePage">
select a.* from (
SELECT
issue.*,laws.LAWS_NUMBER,laws.LAWS_NAME
issue.*,
laws.LAWS_NUMBER,
laws.LAWS_NAME ,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
product_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws
ON issue.law_id = laws.ID
${ew.customSqlSegment}
product_dept_issue AS issue
LEFT JOIN sar_laws_stand_info AS laws ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_dept
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
WHERE 1=1
AND laws.LAWS_NAME is NOT NULL AND laws.LAWS_NUMBER is NOT NULL
<if test="null != ew.isClose and ew.isClose != ''">and issue.is_close like concat('%',#{ew.isClose},'%')
</if>
UNION all
SELECT
issue.*,
CONCAT(laws.
STAND_SORT,' ',laws.STAND_NUMBER,'-',laws.STAND_YEAR)as LAWS_NUMBER,
laws.STAND_NAME as LAWS_NAME,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
product_dept_issue AS issue
LEFT JOIN sar_standards_info AS laws ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_dept
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
WHERE
1=1
AND laws.STAND_SORT is NOT NULL
<if test="null != ew.isClose and ew.isClose != ''">
and issue.is_close like concat('%',#{ew.isClose},'%')
</if>
UNION all
SELECT
issue.*,
laws.STAND_CODE as LAWS_NUMBER,
laws.STAND_NAME as LAWS_NAME,
us.INSTITUTION_ID as responseInsId,
tsins.name as responseInsName,
us.uname as responseUserName
FROM
product_dept_issue AS issue
LEFT JOIN sar_bussioness_stand AS laws ON issue.law_id = laws.ID
left join ts_user as us on us.USID = issue.response_dept
left join ts_institution as tsins on us.INSTITUTION_ID = tsins.id
WHERE
1=1
AND laws.STAND_CODE is NOT NULL AND laws.STAND_NAME is NOT NULL
<if test="null != ew.isClose and ew.isClose != ''">
and issue.is_close like concat('%',#{ew.isClose},'%')
</if>
)a
where 1=1
<if test="null != ew.lawsNumber and ew.lawsNumber != ''">
and ( a.LAWS_NUMBER like concat('%',#{ew.lawsNumber},'%') or a.LAWS_NAME like concat('%',#{ew.lawsNumber},'%') )
</if>
<if test="null != ew.responseInsName and ew.responseInsName != ''">
and a.responseInsName like concat('%',#{ew.responseInsName},'%')
</if>
</select>
</mapper>