625 - bug修改
parent
9201f401bc
commit
a5fc467659
|
|
@ -1,4 +1,4 @@
|
|||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/5/28 09:54:48] App_Identifier[primeport-h5]"><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"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
|
||||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/6/23 13:49:31] App_Identifier[primeport-h5]"><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"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
|
||||
const APP_ENV = {
|
||||
antd: {
|
||||
'ant-prefix': 'micro-temp',
|
||||
|
|
@ -20,4 +20,4 @@
|
|||
redirect: '',
|
||||
FRAMEWORK: APP_ENV.antd
|
||||
};
|
||||
})();</script><script defer="defer" src="/primeport-h5/static/js/942.02e830144bca35fa.js"></script><script defer="defer" src="/primeport-h5/static/js/98.5724b20f0ef70ebd.js"></script><script defer="defer" src="/primeport-h5/static/js/main.74657542ff23a7c3.js"></script><link href="/primeport-h5/static/css/main.de5125c7f5780dd6.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-rspack.1 Frontend_Env[production] Build_Date[2026/5/28 09:54:48] App_Identifier[primeport-h5] Frontend_Branch[master] Backend_Branch[<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-h5/static/js/942.02e830144bca35fa.js"></script><script defer="defer" src="/primeport-h5/static/js/98.d3878dfe7429795b.js"></script><script defer="defer" src="/primeport-h5/static/js/main.8d63c1a19d83b0f8.js"></script><link href="/primeport-h5/static/css/main.de5125c7f5780dd6.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-rspack.1 Frontend_Env[production] Build_Date[2026/6/23 13:49:31] App_Identifier[primeport-h5] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1 +1 @@
|
|||
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"primeport-h5",contextInject:{appKey:"",fileUrl:"https://skqhdg.porthebei.com:9004/file/uploadFiles2/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8082",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
||||
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"primeport-h5",contextInject:{appKey:"",fileUrl:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8082",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,4 @@
|
|||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/5/27 11:13:23] App_Identifier[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"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
|
||||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/6/23 15:42:08] App_Identifier[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"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
|
||||
const APP_ENV = {
|
||||
antd: {
|
||||
'ant-prefix': 'micro-temp',
|
||||
|
|
@ -20,4 +20,4 @@
|
|||
redirect: '',
|
||||
FRAMEWORK: APP_ENV.antd
|
||||
};
|
||||
})();</script><script defer="defer" src="/primeport/static/js/942.000313a5011c30f5.js"></script><script defer="defer" src="/primeport/static/js/98.30519a2ee5fa0ad4.js"></script><script defer="defer" src="/primeport/static/js/main.d44bb8e4900fb461.js"></script><link href="/primeport/static/css/main.de5125c7f5780dd6.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-rspack.1 Frontend_Env[production] Build_Date[2026/5/27 11:13:23] App_Identifier[primeport] Frontend_Branch[master] Backend_Branch[<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/942.000313a5011c30f5.js"></script><script defer="defer" src="/primeport/static/js/98.90d75146a9ca149f.js"></script><script defer="defer" src="/primeport/static/js/main.86fd942c0d684f8e.js"></script><link href="/primeport/static/css/main.de5125c7f5780dd6.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-rspack.1 Frontend_Env[production] Build_Date[2026/6/23 15:42:08] App_Identifier[primeport] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1 +1 @@
|
|||
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"primeport",contextInject:{appKey:"",fileUrl:"https://skqhdg.porthebei.com:9004/file/uploadFiles2/"},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8082",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
||||
module.exports={javaGit:"<git-url>",javaGitName:"<git-name>",environment:{development:{javaGitBranch:"<branch-name>",API_HOST:"https://gbs-gateway.qhdsafety.com"},production:{javaGitBranch:"<branch-name>",API_HOST:""}},appIdentifier:"primeport",contextInject:{appKey:"",fileUrl:""},windowInject:{title:"微应用模板",links:[],element:{root:{id:"root"}},scripts:[]},server:{port:"8082",host:"127.0.0.1",open:!0},framework:{antd:{"ant-prefix":"micro-temp",fontFamily:"PingFangSC-Regular",colorPrimary:"#1677ff",borderRadius:2}},webpackConfig:{htmlWebpackPluginOption:{inject:!0}}};
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -57,6 +57,9 @@ public class MkmjQueryExe {
|
|||
if (qry.getClosedAreaId() != null) {
|
||||
mkmjDOQueryWrapper.eq("closed_area_id", qry.getClosedAreaId());
|
||||
}
|
||||
if (Tools.notEmpty(qry.getMkmjType())) {
|
||||
mkmjDOQueryWrapper.eq("mkmj_type", qry.getMkmjType());
|
||||
}
|
||||
List<MkmjDO> list = mkmjRepository.list(mkmjDOQueryWrapper);
|
||||
List<MkmjCO> examCenterCOS = mkmjCoConvertor.converDOsToCOs(list);
|
||||
return examCenterCOS;
|
||||
|
|
|
|||
|
|
@ -94,6 +94,8 @@ public class PersonApplyCO extends ClientObject {
|
|||
@ApiModelProperty(value = "审批时间",name = "auditTime")
|
||||
private String auditTime;
|
||||
private String userUid;
|
||||
@ApiModelProperty(value = "创建时间",name = "createTime")
|
||||
private String createTime;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,10 @@ public class UserCo extends ClientObject {
|
|||
private Long deptId;
|
||||
@ApiModelProperty(value = "部门名称",name = "deptName")
|
||||
private String deptName;
|
||||
@ApiModelProperty(value = "岗位id",name = "postId")
|
||||
private Long postId;
|
||||
@ApiModelProperty(value = "岗位名称",name = "postName")
|
||||
private String postName;
|
||||
@ApiModelProperty(value = "用户id",name = "userId")
|
||||
private Long userId;
|
||||
@ApiModelProperty(value = "入职状态，0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核",name = "employmentFlag")
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ public class UserDto implements Serializable {
|
|||
private Long deptId;
|
||||
@ApiModelProperty(value = "部门名称",name = "deptName")
|
||||
private String deptName;
|
||||
@ApiModelProperty(value = "岗位id",name = "postId")
|
||||
private Long postId;
|
||||
@ApiModelProperty(value = "岗位名称",name = "postName")
|
||||
private String postName;
|
||||
@ApiModelProperty(value = "用户id",name = "userId")
|
||||
private Long userId;
|
||||
@ApiModelProperty(value = "入职状态，0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核",name = "employmentFlag")
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
u.username user_name,
|
||||
u.`name`,
|
||||
u.corpinfo_id corpId,
|
||||
u.post_id,
|
||||
u.post_name,
|
||||
c.corp_name,
|
||||
d.id dept_Id,
|
||||
d.`name` dept_Name,
|
||||
|
|
@ -58,6 +60,9 @@
|
|||
<select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO">
|
||||
select c.*,c.create_name apply_user_name from closed_area_person_apply c
|
||||
where c.delete_enum = 'FALSE'
|
||||
<if test="params.deptId != null">
|
||||
AND c.apply_person_department_id = #{params.deptId}
|
||||
</if>
|
||||
<if test="params.processOrRecord != null">
|
||||
<if test="params.processOrRecord == 1">
|
||||
AND c.audit_flag = 1
|
||||
|
|
|
|||
|
|
@ -103,7 +103,8 @@
|
|||
xap.audit_dept_name,
|
||||
xap.audit_corp_id,
|
||||
xap.audit_corp_name,
|
||||
xap.audit_time
|
||||
xap.audit_time,
|
||||
xap.create_time
|
||||
FROM
|
||||
person_apply AS pa
|
||||
LEFT JOIN
|
||||
|
|
|
|||
Loading…
Reference in New Issue