Browse Source

修改bug

master
ma 4 years ago
parent
commit
fc06c19ffa
  1. 4
      src/main/java/com/ccsens/defaultwbs/bean/vo/DeliverVo.java
  2. 2
      src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java
  3. 8
      src/main/java/com/ccsens/defaultwbs/service/DeliverService.java
  4. 4
      src/main/resources/application.yml
  5. 3
      src/main/resources/mapper_dao/ProDeliverDao.xml

4
src/main/java/com/ccsens/defaultwbs/bean/vo/DeliverVo.java

@ -16,6 +16,10 @@ public class DeliverVo {
private Long memberId;
@ApiModelProperty("检查人名字")
private String name;
@ApiModelProperty("用户id")
private Long userId;
@ApiModelProperty("是不是我(0-否,1-是)")
private Byte isMine = 0;
}

2
src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java

@ -229,9 +229,11 @@ public class ClockingInService implements IClockingInService {
proClockingIn.setId(params.getId());
if (ObjectUtil.isNotNull(params.getMorning())) {
proClockingIn.setMorning(params.getMorning());
proClockingIn.setMorningStatus((byte)1);
}
if (ObjectUtil.isNotNull(params.getNight())) {
proClockingIn.setNight(params.getNight());
proClockingIn.setNightStatus((byte)1);
}
clockingInDao.updateByPrimaryKeySelective(proClockingIn);
}

8
src/main/java/com/ccsens/defaultwbs/service/DeliverService.java

@ -65,7 +65,13 @@ public class DeliverService implements IDeliverService {
@Override
public List<DeliverVo.Checker> queryChecker(DeliverDto.QueryChecker params, Long userId) {
return deliverDao.queryChecker(params.getProjectId());
List<DeliverVo.Checker> checkers = deliverDao.queryChecker(params.getProjectId());
for (DeliverVo.Checker checker : checkers) {
if (checker.getUserId().equals(userId)){
checker.setIsMine((byte)1);
}
}
return checkers;
}

4
src/main/resources/application.yml

@ -1,4 +1,4 @@
spring:
profiles:
active: prod
include: common, util-prod
active: test
include: common, util-test

3
src/main/resources/mapper_dao/ProDeliverDao.xml

@ -76,7 +76,8 @@
<select id="queryChecker" resultType="com.ccsens.defaultwbs.bean.vo.DeliverVo$Checker">
SELECT
id AS memberId,
`name`
`name`,
user_id
FROM
t_pro_member
WHERE

Loading…
Cancel
Save