jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-01-15 00:49:31 +08:00
parent 5be1fdd66a
commit 4dde6b7b36
4 changed files with 68 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/StringUtils.java
View File

@ -717,7 +717,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
*/
public static int getAgeFromIdCard(String idCard) {
if (idCard == null || idCard.length() != 18) {
throw new IllegalArgumentException("身份证号码无效！");
return 0;
}
// 提取出生日期（身份证号的第7到第14位）
String birthDateStr = idCard.substring(6, 14);

8
yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowBusinessKeyController.java
View File

@ -180,7 +180,13 @@ public class FlowBusinessKeyController extends BaseController {
flowTaskEntity.setStartProId(Convert.toStr(loginUser.getProjectId()));
}else{
flowTaskEntity.setAssigneeId(SecurityUtils.getUserId());
flowTaskEntity.setRoleIds(Arrays.asList(SecurityUtils.getLoginUser().getSysUser().getRoleIds()));
if(loginUser.getSysUser().getRoles().size()>0){
flowTaskEntity.setRoleIds(loginUser.getSysUser().getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
}else{
List<Long> roleIds = new ArrayList<>();
roleIds.add(0L);
flowTaskEntity.setRoleIds(roleIds);
}
}
startPage();
return getDataTable(flowBusinessKeyService.selectMyAwaitFlowTask(flowTaskEntity));

50
yanzhu-ui-vue3/src/views/flowable/task/myProcess/detail/indexDrawer.vue
View File

@ -138,20 +138,54 @@
<el-tab-pane label="人员信息" name="users" v-if="dataOptions.category=='1' || dataOptions.category=='2' || dataOptions.category=='3' || dataOptions.category=='4'">
<el-form label-width="100px" size="small" >
<el-form-item label="代理人身份证" v-if="dataOptions.category=='1'">
<ImagePreview :src="initData.user.cardImgPos" :width="120" :height="70"/>
<ImagePreview :src="initData.user.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
<ImagePreview :src="initData.userInfos.cardImgPos" :width="120" :height="70"/>
<ImagePreview :src="initData.userInfos.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
</el-form-item>
<el-form-item label="入场肖像近照" v-if="dataOptions.category=='1'">
<ImagePreview :src="initData.user.userPicture" :width="120" :height="70"/>
<ImagePreview :src="initData.userPicture" :width="120" :height="70"/>
</el-form-item>
<el-form-item label="单位委托证明" v-if="dataOptions.category=='1'">
<el-form-item label="单位委托证明" v-if="dataOptions.category!='4'">
<ImagePreview :src="initData.subDeptPowerPath" :width="120" :height="70"/>
</el-form-item>
<el-form-item label="委托人姓名" v-if="dataOptions.category=='1'">
{{ initData.user.nickName }} <el-tag type="info">{{ initData.user.cardCode }}</el-tag>
{{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
</el-form-item>
<el-form-item label="人员姓名" v-if="dataOptions.category!='1'">
{{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
</el-form-item>
<el-form-item label="工种岗位" v-if="dataOptions.category!='1'">
{{ initData.craftPostName }}
</el-form-item>
<el-form-item label="工种班组" v-if="dataOptions.category!='1' && dataOptions.category!='2'">
{{ initData.subDeptGroupName }}
</el-form-item>
<el-form-item label="所属民族" v-if="dataOptions.category!='1'">
{{ initData.userInfos.nativePlace }}
</el-form-item>
<el-form-item label="详细地址" v-if="dataOptions.category!='1'">
{{ initData.userInfos.address }}
</el-form-item>
<el-form-item label="身份证照片" v-if="dataOptions.category!='1'">
<ImagePreview :src="initData.userInfos.cardImgPos" :width="120" :height="70"/>
<ImagePreview :src="initData.userInfos.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
</el-form-item>
<el-form-item label="入场肖像近照" v-if="dataOptions.category!='1'">
<ImagePreview :src="initData.userPicture" :width="120" :height="70"/>
</el-form-item>
<el-form-item label="紧急联系人" v-if="dataOptions.category!='1'">
{{ initData.userInfos.emergencyContact }} <el-tag type="info">{{ initData.userInfos.contactPhone }}</el-tag>
</el-form-item>
<el-form-item label="开户行名称" v-if="dataOptions.category=='4'">
{{ initData.userInfos.bankName }}
</el-form-item>
<el-form-item label="开户行网点" v-if="dataOptions.category=='4'">
{{ initData.userInfos.bankName }}
</el-form-item>
<el-form-item label="工资银行卡号" v-if="dataOptions.category=='4'">
{{ initData.userInfos.bankName }}
</el-form-item>
<el-form-item label="联系电话">
{{ initData.user.userName }}
{{ initData.userPhone }}
</el-form-item>
<el-form-item label="文化程度">
<el-tag effect="dark">{{ initData.degreeGradeName }}</el-tag>
@ -446,8 +480,8 @@
let category = parseInt(dataOptions.value.category);
if(category==1 || category==2 || category==3 || category==4){
getProProjectInfoSubdeptsUsers(dataOptions.value.businessKey).then(res =>{
if(res.data.user.userInfos){
res.data.user.userInfos = JSON.parse(res.data.user.userInfos);
if(res.data.userInfos){
res.data.userInfos = JSON.parse(res.data.userInfos);
}
initData.value = res.data ;
getProProjectInfoSubdepts(res.data.subDeptId).then(parRes =>{

36
yanzhu-ui-vue3/src/views/flowable/task/todo/detail/indexDrawer.vue
View File

@ -138,20 +138,20 @@
<el-tab-pane label="人员信息" name="users" v-if="dataOptions.category=='1' || dataOptions.category=='2' || dataOptions.category=='3' || dataOptions.category=='4'">
<el-form label-width="100px" size="small" >
<el-form-item label="代理人身份证" v-if="dataOptions.category=='1'">
<ImagePreview :src="initData.user.cardImgPos" :width="120" :height="70"/>
<ImagePreview :src="initData.user.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
<ImagePreview :src="initData.userInfos.cardImgPos" :width="120" :height="70"/>
<ImagePreview :src="initData.userInfos.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
</el-form-item>
<el-form-item label="入场肖像近照" v-if="dataOptions.category=='1'">
<ImagePreview :src="initData.user.userPicture" :width="120" :height="70"/>
<ImagePreview :src="initData.userPicture" :width="120" :height="70"/>
</el-form-item>
<el-form-item label="单位委托证明" v-if="dataOptions.category=='4'">
<el-form-item label="单位委托证明" v-if="dataOptions.category!='4'">
<ImagePreview :src="initData.subDeptPowerPath" :width="120" :height="70"/>
</el-form-item>
<el-form-item label="委托人姓名" v-if="dataOptions.category=='1'">
{{ initData.user.nickName }} <el-tag type="info">{{ initData.user.cardCode }}</el-tag>
{{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
</el-form-item>
<el-form-item label="人员姓名" v-if="dataOptions.category!='1'">
{{ initData.user.nickName }} <el-tag type="info">{{ initData.user.cardCode }}</el-tag>
{{ initData.userName }} <el-tag type="info">{{ initData.cardCode }}</el-tag>
</el-form-item>
<el-form-item label="工种岗位" v-if="dataOptions.category!='1'">
{{ initData.craftPostName }}
@ -160,32 +160,32 @@
{{ initData.subDeptGroupName }}
</el-form-item>
<el-form-item label="所属民族" v-if="dataOptions.category!='1'">
{{ initData.user.userInfos.nativePlace }}
{{ initData.userInfos.nativePlace }}
</el-form-item>
<el-form-item label="详细地址" v-if="dataOptions.category!='1'">
{{ initData.user.userInfos.address }}
{{ initData.userInfos.address }}
</el-form-item>
<el-form-item label="身份证照片" v-if="dataOptions.category!='1'">
<ImagePreview :src="initData.user.cardImgPos" :width="120" :height="70"/>
<ImagePreview :src="initData.user.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
<ImagePreview :src="initData.userInfos.cardImgPos" :width="120" :height="70"/>
<ImagePreview :src="initData.userInfos.cardImgInv" :width="120" :height="70" style="margin-left: 20px;"/>
</el-form-item>
<el-form-item label="入场肖像近照" v-if="dataOptions.category!='1'">
<ImagePreview :src="initData.user.userPicture" :width="120" :height="70"/>
<ImagePreview :src="initData.userPicture" :width="120" :height="70"/>
</el-form-item>
<el-form-item label="紧急联系人" v-if="dataOptions.category!='1'">
{{ initData.user.userInfos.emergencyContact }} <el-tag type="info">{{ initData.user.contactPhone }}</el-tag>
{{ initData.userInfos.emergencyContact }} <el-tag type="info">{{ initData.userInfos.contactPhone }}</el-tag>
</el-form-item>
<el-form-item label="开户行名称" v-if="dataOptions.category=='4'">
{{ initData.user.userInfos.bankName }}
{{ initData.userInfos.bankName }}
</el-form-item>
<el-form-item label="开户行网点" v-if="dataOptions.category=='4'">
{{ initData.user.userInfos.bankName }}
{{ initData.userInfos.bankName }}
</el-form-item>
<el-form-item label="工资银行卡号" v-if="dataOptions.category=='4'">
{{ initData.user.userInfos.bankName }}
{{ initData.userInfos.bankName }}
</el-form-item>
<el-form-item label="联系电话">
{{ initData.user.userName }}
{{ initData.userPhone }}
</el-form-item>
<el-form-item label="文化程度">
<el-tag effect="dark">{{ initData.degreeGradeName }}</el-tag>
@ -623,8 +623,8 @@
let category = parseInt(dataOptions.value.category);
if(category==1 || category==2 || category==3 || category==4){
getProProjectInfoSubdeptsUsers(dataOptions.value.businessKey).then(res =>{
if(res.data.user.userInfos){
res.data.user.userInfos = JSON.parse(res.data.user.userInfos);
if(res.data.userInfos){
res.data.userInfos = JSON.parse(res.data.userInfos);
}
initData.value = res.data ;
getProProjectInfoSubdepts(res.data.subDeptId).then(parRes =>{