bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
dingjie 2023-12-20 20:02:56 +08:00
parent f6566e60f8 f5d0deb4c8
commit 4abf71e754
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
View File

@ -81,4 +81,9 @@ public class BackApplyInfo {
* 审核备注
*/
private String directAuditRemark;
private String code;
private String backPerson;
private String lotId;
private String unitId;
private String backTime;
}

8
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
View File

@ -305,12 +305,16 @@
<select id="getbackList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT
bai.id,
us.user_name as userName,
bai.`code`,
bai.back_person as backPerson,
bai.phone,
bpl.lot_id,
bpl.lot_name as lotName,
bui.unit_id as unitId,
bui.unit_name as unitName,
bagi.plan_start_time as planStartTime,
bai.back_time as backTime,
tt.task_status as taskStatus,
tta.agreement_id as agreementId,
GROUP_CONCAT(DISTINCT bad.type_id) as typeId,
GROUP_CONCAT(CONCAT_WS('/', IFNULL(mt3.type_name, ''))) AS typeName
FROM

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
View File

@ -62,8 +62,9 @@ public class AgreementInfoServiceImpl implements AgreementInfoService {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date nowDate = DateUtils.getNowDate();
String format = dateFormat.format(nowDate);
String result = format.replace("-", "");
int num = agreementInfoMapper.selectNumByMonth(nowDate) + 1;
String code = "XY" + format + "-000" + num;
String code = "XY" + result + "000" + num;
return code;
}
}