zcloud_gbs
/
zcloud-gbs-primeport
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat：相关方人员申请通过过进出港权限显示不对的bug

koumen
dearLin 2026-03-27 17:04:06 +08:00
parent af5ec666f1
commit 3b79c52000
10 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start/src/main/resources/templates/primeport.html
View File

@ -1,4 +1,4 @@
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0 Env/production (2026/3/27 10:22:35) App/primeport"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () { <!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0 Env/production (2026/3/27 17:02:17) App/primeport"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><title>--</title><script>(function () {
const APP_ENV = { const APP_ENV = {
antd: { antd: {
'ant-prefix': 'micro-temp', 'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
redirect: '', redirect: '',
FRAMEWORK: APP_ENV.antd FRAMEWORK: APP_ENV.antd
}; };
})();</script><script defer="defer" src="/primeport/static/js/75.7bab4be25660eb2345d0.js"></script><script defer="defer" src="/primeport/static/js/745.6c11d239e0f8b46a1914.js"></script><script defer="defer" src="/primeport/static/js/main.6c040d8c06cc147a531a.js"></script><link href="/primeport/static/css/main.ef1f3389c7ea99a7bdd0.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0 Env/production (2026/3/27 10:22:35) App/primeport Version/master Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html> })();</script><script defer="defer" src="/primeport/static/js/75.7bab4be25660eb2345d0.js"></script><script defer="defer" src="/primeport/static/js/745.8d29bff9db591207737c.js"></script><script defer="defer" src="/primeport/static/js/main.180b5526ecf81230b21e.js"></script><link href="/primeport/static/css/main.ef1f3389c7ea99a7bdd0.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息、构建时间 */console.log("%c@cqsjjb/scripts@2.0.0 Env/production (2026/3/27 17:02:17) App/primeport Version/master Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

6
web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java
View File

@ -34,6 +34,12 @@ public class MkmjController {
return mkmjService.add(cmd); return mkmjService.add(cmd);
} }
@ApiOperation("分页")
@PostMapping("/listNoToken")
public PageResponse<MkmjCO> listNoToken(@RequestBody MkmjPageQry qry) {
return mkmjService.listPage(qry);
}
@ApiOperation("分页") @ApiOperation("分页")
@PostMapping("/list") @PostMapping("/list")
public PageResponse<MkmjCO> page(@RequestBody MkmjPageQry qry) { public PageResponse<MkmjCO> page(@RequestBody MkmjPageQry qry) {

3
web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java
View File

@ -90,7 +90,7 @@ public class ClosedTmpApplyController {
stringObjectHashMap.put("value", cmd.getHgAuthAreaName()); stringObjectHashMap.put("value", cmd.getHgAuthAreaName());
hashMaps.add(stringObjectHashMap); hashMaps.add(stringObjectHashMap);
HashMap<String, Object> stringObjectHashMap2 = new HashMap<>(); HashMap<String, Object> stringObjectHashMap2 = new HashMap<>();
stringObjectHashMap2.put("area", stringObjectHashMap); stringObjectHashMap2.put("area", hashMaps);
vehicleApplyAddCmd.setGateLevelAuthArea(JSON.toJSONString(stringObjectHashMap2)); vehicleApplyAddCmd.setGateLevelAuthArea(JSON.toJSONString(stringObjectHashMap2));
vehicleApplyAddCmd.setAuditCorpId(cmd.getAuditPersonCorpId()); vehicleApplyAddCmd.setAuditCorpId(cmd.getAuditPersonCorpId());
vehicleApplyAddCmd.setAuditCorpName(cmd.getAuditPersonCorpName()); vehicleApplyAddCmd.setAuditCorpName(cmd.getAuditPersonCorpName());
@ -99,6 +99,7 @@ public class ClosedTmpApplyController {
vehicleApplyAddCmd.setAuditUserId(cmd.getAuditPersonUserId()); vehicleApplyAddCmd.setAuditUserId(cmd.getAuditPersonUserId());
vehicleApplyAddCmd.setAuditUserName(cmd.getAuditPersonUserName()); vehicleApplyAddCmd.setAuditUserName(cmd.getAuditPersonUserName());
vehicleApplyAddCmd.setMkmjId(cmd.getLevelOneMkmjId()); vehicleApplyAddCmd.setMkmjId(cmd.getLevelOneMkmjId());
vehicleApplyAddCmd.setMkmjName(cmd.getLevelOneMkmjName());
vehicleApplyAddCmd.setLsUserIdcard(cmd.getUserCard()); vehicleApplyAddCmd.setLsUserIdcard(cmd.getUserCard());
vehicleApplyAddCmd.setLsUserPhone(cmd.getUserPhone()); vehicleApplyAddCmd.setLsUserPhone(cmd.getUserPhone());
vehicleApplyAddCmd.setEmployeeVehicleUserName(cmd.getApplyPersonUserName()); vehicleApplyAddCmd.setEmployeeVehicleUserName(cmd.getApplyPersonUserName());

6
web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyAddExe.java
View File

@ -16,6 +16,7 @@ import com.zcloud.primeport.domain.model.VehicleApplyE;
import com.zcloud.primeport.domain.model.VehicleAuditE; import com.zcloud.primeport.domain.model.VehicleAuditE;
import com.zcloud.primeport.domain.model.VehicleMessageE; import com.zcloud.primeport.domain.model.VehicleMessageE;
import com.zcloud.primeport.dto.VehicleApplyAddCmd; import com.zcloud.primeport.dto.VehicleApplyAddCmd;
import jodd.util.Base64;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -69,6 +70,11 @@ public class VehicleApplyAddExe {
examTypeE.setVehicleCorpId(user.getTenantId()); examTypeE.setVehicleCorpId(user.getTenantId());
examTypeE.setVehicleCorpName(user.getTenantName()); examTypeE.setVehicleCorpName(user.getTenantName());
} }
if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.TEMP_VEHICLES.getCode())){
// 临时
examTypeE.setEmployeeVehicleUserName(cmd.getDrivingUserName());
examTypeE.setLsUserIdcard(Base64.encodeToString(cmd.getLsUserIdcard()));
}
VehicleApplyE add = vehicleApplyGateway.add(examTypeE); VehicleApplyE add = vehicleApplyGateway.add(examTypeE);
VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1) VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(examTypeE.getId()).batchState(1).batchType(1)
.auditUserId(examTypeE.getAuditUserId()) .auditUserId(examTypeE.getAuditUserId())

3
web-app/src/main/java/com/zcloud/primeport/command/VehicleAuditUpdateExe.java
View File

@ -48,6 +48,9 @@ public class VehicleAuditUpdateExe {
vehicleApplyE.setId(cmd.getVehicleApplyId()); vehicleApplyE.setId(cmd.getVehicleApplyId());
vehicleApplyE.setAuditFlag(cmd.getAuditStatus()); vehicleApplyE.setAuditFlag(cmd.getAuditStatus());
vehicleApplyE.setMkmjPermission(1); vehicleApplyE.setMkmjPermission(1);
if (cmd.getAuditStatus().equals(3)) {
vehicleApplyE.setMkmjPermission(2);
}
vehicleApplyE.setStatusFlag(2); vehicleApplyE.setStatusFlag(2);
vehicleApplyGateway.update(vehicleApplyE); vehicleApplyGateway.update(vehicleApplyE);
vehicleAuditGateway.update(vehicleAuditE); vehicleAuditGateway.update(vehicleAuditE);

2
web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyAddCmd.java
View File

@ -69,6 +69,8 @@ public class VehicleApplyAddCmd extends Command {
// private Integer blockedFlag; // private Integer blockedFlag;
@ApiModelProperty(value = "口门id", name = "mkmjId") @ApiModelProperty(value = "口门id", name = "mkmjId")
private Long mkmjId; private Long mkmjId;
@ApiModelProperty(value = "口门名称", name = "mkmjName")
private String mkmjName;
@ApiModelProperty(value = "临时申请驾驶人手机号", name = "lsUserPhone") @ApiModelProperty(value = "临时申请驾驶人手机号", name = "lsUserPhone")
private String lsUserPhone; private String lsUserPhone;
@ApiModelProperty(value = "临时申请驾驶人身份证", name = "lsUserIdcard") @ApiModelProperty(value = "临时申请驾驶人身份证", name = "lsUserIdcard")

1
web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java
View File

@ -73,6 +73,7 @@ public class VehicleApplyE extends BaseE {
//1被拉黑2未拉黑 //1被拉黑2未拉黑
private Integer blockedFlag; private Integer blockedFlag;
private Long mkmjId; private Long mkmjId;
private String mkmjName;
private String lsUserPhone; private String lsUserPhone;
private String lsUserIdcard; private String lsUserIdcard;
private Long auditCorpId; private Long auditCorpId;

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java
View File

@ -102,11 +102,8 @@ public class VehicleApplyDO extends BaseDO {
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "项目人员数") @ApiModelProperty(value = "项目人员数")
private Integer personApplyCount; private Integer personApplyCount;
private Long mkmjId; private Long mkmjId;
@TableField(exist = false)
private String mkmjName; private String mkmjName;
private String lsUserPhone; private String lsUserPhone;
private String lsUserIdcard; private String lsUserIdcard;
private String drivingUserName; private String drivingUserName;

5
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleAuditDO.java
View File

@ -136,6 +136,9 @@ public class VehicleAuditDO extends BaseDO {
private String projectName; private String projectName;
@TableField(exist = false) @TableField(exist = false)
private String projectId; private String projectId;
@TableField(exist = false)
private String mkmjName;
@TableField(exist = false)
private Long mkmjId;
} }

1
web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml
View File

@ -46,6 +46,7 @@
va.ls_user_phone, va.ls_user_phone,
va.ls_user_idcard, va.ls_user_idcard,
va.mkmj_id, va.mkmj_id,
va.mkmj_name,
va.blocked_flag, va.blocked_flag,
va.remarks reason_visit va.remarks reason_visit
FROM FROM