Commit 8994f437 by huluobin

update

parent fa4751f5
......@@ -2,8 +2,8 @@ spring:
# 数据源配置
datasource:
driver-class-name: com.mysql.jdbc.Driver
# url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://10.0.8.2:3306/bailun_other?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://gz-cdb-lnrmt5zh.sql.tencentcdb.com:61369/bailun_other?useUnicode=true&characterEncoding=UTF-8&useSSL=false
# url: jdbc:mysql://10.0.8.2:3306/bailun_other?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username: root
password: "#7kfnymAM$Y9-Ntf"
hikari:
......
......@@ -466,7 +466,7 @@
and (t7.reviewer_user_id = #{req.userid} )
</if>
<if test=" req.costNo!=null and req.costNo != ''">
and t1.cost_no =#{req.costNo}
and t1.cost_no like concat('%',#{req.costNo},'%')
</if>
group by
t1.id
......
package com.blt.other.module.auth.service.impl;
import com.bailuntec.common.ListUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.blt.other.module.auth.dao.CostReviewerMapper;
import com.blt.other.module.auth.dao.OaDepartmentMapper;
......@@ -16,6 +17,7 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.annotation.Resource;
import java.util.List;
/**
* <p>
......@@ -71,23 +73,29 @@ public class OaDepartmentServiceImplTest {
@Test
public void setDepartmentReviewer() {
costReviewerMapper.delete(new LambdaQueryWrapper<CostReviewer>()
.eq(CostReviewer::getType, CostReviewer.departmentReviewer));
oaDepartmentMapper.selectList(new LambdaQueryWrapper<>())
.forEach(oaDepartment -> {
try {
String manage = oaDepartment.getManageUser1();
OaUser oaUser = oaUserMapper.selectByUserName(manage);
CostReviewer costReviewer = CostReviewer.builder()
.reviewerUserId(oaUser.getOaUserId())
.reviewerUserName(oaUser.getUserName())
.referId(oaDepartment.getDepartmentId())
.type(CostReviewer.departmentReviewer)
.build();
List<CostReviewer> costReviewerList = costReviewerMapper.selectList(new LambdaQueryWrapper<CostReviewer>()
.eq(CostReviewer::getType, CostReviewer.departmentReviewer)
.eq(CostReviewer::getReferId, oaDepartment.getDepartmentId()));
if (ListUtil.isEmpty(costReviewerList)) {
String manage = oaDepartment.getManageUser1();
OaUser oaUser = oaUserMapper.selectByUserName(manage);
CostReviewer costReviewer = CostReviewer.builder()
.reviewerUserId(oaUser.getOaUserId())
.reviewerUserName(oaUser.getUserName())
.referId(oaDepartment.getDepartmentId())
.type(CostReviewer.departmentReviewer)
.build();
costReviewerMapper.insert(costReviewer);
}
costReviewerMapper.insert(costReviewer);
} catch (Exception ignore) {
}
......
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