1.添加新增字段

master
862857010@qq.com 1 year ago
parent db2bed9c8c
commit 0d9a79a931
  1. 11
      ruoyi-system/src/main/java/com/ruoyi/system/controller/IndividualMemberController.java
  2. 9
      ruoyi-system/src/main/java/com/ruoyi/system/controller/UnitMemberController.java
  3. 28
      ruoyi-system/src/main/java/com/ruoyi/system/domain/UnitMember.java
  4. 1
      ruoyi-system/src/main/java/com/ruoyi/system/service/IIndividualMemberService.java
  5. 1
      ruoyi-system/src/main/java/com/ruoyi/system/service/IUnitMemberService.java
  6. 8
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IndividualMemberServiceImpl.java
  7. 8
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UnitMemberServiceImpl.java
  8. 1
      ruoyi-system/src/main/resources/mapper/system/IndividualMemberMapper.xml
  9. 91
      ruoyi-system/src/main/resources/mapper/system/UnitMemberMapper.xml
  10. 61
      ruoyi-ui/src/views/system/member/index.vue
  11. 50
      ruoyi-ui/src/views/system/personalmember/index.vue

@ -100,6 +100,17 @@ public class IndividualMemberController extends BaseController
return toAjax(individualMemberService.updateIndividualMember(individualMember));
}
/**
* 修改个人会员
*/
@PreAuthorize("@ss.hasPermi('system:personalmember:edit')")
@Log(title = "个人会员", businessType = BusinessType.UPDATE)
@PostMapping("personalCheckFile")
public AjaxResult personalCheckFile (@RequestBody IndividualMember individualMember) {
individualMember.setUpdateBy(getLoginUser().getUserId().toString());
return toAjax(individualMemberService.personalCheckFile(individualMember));
}
/**
* 删除个人会员
*/

@ -109,4 +109,13 @@ public class UnitMemberController extends BaseController
{
return toAjax(unitMemberService.deleteUnitMemberByIds(ids));
}
@PreAuthorize("@ss.hasPermi('system:member:edit')")
@Log(title = "单位会员", businessType = BusinessType.UPDATE)
@PostMapping("/check")
public AjaxResult check(@RequestBody UnitMember unitMember) throws Exception {
unitMember.setUpdateBy(getLoginUser().getUserId().toString());
return toAjax(unitMemberService.check(unitMember));
}
}

@ -118,6 +118,34 @@ public class UnitMember extends BaseEntity
//登记机关省
private String registrationAuthorityProvince;
private String registrationAuthorityProvinceName;
private String registrationAuthorityCityName;
private String registrationAuthorityAreaName;
public String getRegistrationAuthorityProvinceName() {
return registrationAuthorityProvinceName;
}
public void setRegistrationAuthorityProvinceName(String registrationAuthorityProvinceName) {
this.registrationAuthorityProvinceName = registrationAuthorityProvinceName;
}
public String getRegistrationAuthorityCityName() {
return registrationAuthorityCityName;
}
public void setRegistrationAuthorityCityName(String registrationAuthorityCityName) {
this.registrationAuthorityCityName = registrationAuthorityCityName;
}
public String getRegistrationAuthorityAreaName() {
return registrationAuthorityAreaName;
}
public void setRegistrationAuthorityAreaName(String registrationAuthorityAreaName) {
this.registrationAuthorityAreaName = registrationAuthorityAreaName;
}
public String getWordUrl() {
return wordUrl;
}

@ -43,6 +43,7 @@ public interface IIndividualMemberService
* @return 结果
*/
public int updateIndividualMember(IndividualMember individualMember) throws Exception;
public int personalCheckFile(IndividualMember individualMember) ;
/**
* 批量删除个人会员

@ -42,6 +42,7 @@ public interface IUnitMemberService
* @return 结果
*/
public int updateUnitMember(UnitMember unitMember) throws Exception;
public int check(UnitMember unitMember) throws Exception;
/**
* 批量删除单位会员

@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -233,6 +234,13 @@ public class IndividualMemberServiceImpl implements IIndividualMemberService
String url= GenerateDocxUtil.freemarkerDocxTest("personal",rootPath,normalizeMap(map) ,docxPath+"1-"+individualMember.getId()+".docx");
individualMember.setWordUrl("/worddocx/file/"+"1-"+individualMember.getId()+".docx");
individualMember.setApprovalStatus("1");
return individualMemberMapper.updateIndividualMember(individualMember);
}
@Override
public int personalCheckFile(IndividualMember individualMember) {
individualMember.setUpdateTime(new Date());
return individualMemberMapper.updateIndividualMember(individualMember);
}

@ -149,6 +149,14 @@ public class UnitMemberServiceImpl implements IUnitMemberService
}
String url= GenerateDocxUtil.freemarkerDocxTest("unit_stencil",rootPath,normalizeMap(map) ,docxPath+"2-"+unitMember.getId()+".docx");
unitMember.setWordUrl("/worddocx/file/"+"2-"+unitMember.getId()+".docx");
unitMember.setApprovalStatus("1");
return unitMemberMapper.updateUnitMember(unitMember);
}
@Override
public int check(UnitMember unitMember) throws Exception {
unitMember.setUpdateTime(DateUtils.getNowDate());
unitMember.setUpdateBy(unitMember.getUpdateBy());
return unitMemberMapper.updateUnitMember(unitMember);
}

@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contactNumber != null and contactNumber != ''"> and contact_number = #{contactNumber}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="approvalStatus != null and approvalStatus != ''"> and approval_status = #{approvalStatus}</if>
<if test="nameOfInheritanceProject != null and nameOfInheritanceProject != ''"> and name like concat('%', #{nameOfInheritanceProject}, '%')</if>
</where>
</select>

@ -42,32 +42,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectUnitMemberList" parameterType="UnitMember" resultMap="UnitMemberResult">
<include refid="selectUnitMemberVo"/>
select
t1.id,
t1.company_name,
t1.unit_residence,
t1.unified_social_credit_code,
t1.date_of_establishment,
t1.registration_authority_city,
t1.registration_authority_area,
t1.registered_capital,
t1.legal_representative,
t1.head_of_an_unincorporated_organization,
t1.unit_type,
t1.application_level,
t1.legal_authority_name,
t1.legal_authority_sex,
t1.legal_authority_nationality,
t1.legal_authority_political_status,
t1.legal_authority_working_department,
t1.legal_authority_position,
t1.legal_authority_id_number,
t1.contact_number,
t1.basic_information_of_the_unit,
t1.create_by,
t1.create_time,
t1.update_by,
t1.update_time,
t1.corporate,
t1.unincorporated_organizations,
t1.word_url,
t1.approval_status,
t1.administrative_approval_bureau,
t1.registration_authority_province,
t2.region_name as registrationAuthorityProvinceName,
t3.region_name as registrationAuthorityCityName,
t4.region_name as registrationAuthorityAreaName
from unit_member t1
left join region t2 on t2.region_id = t1.registration_authority_province
left join region t3 on t3.region_id = t1.registration_authority_city
left join region t4 on t4.region_id = t1.registration_authority_area
<where>
<if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
<if test="unitResidence != null and unitResidence != ''"> and unit_residence like concat('%', #{unitResidence}, '%')</if>
<if test="unifiedSocialCreditCode != null and unifiedSocialCreditCode != ''"> and unified_social_credit_code like concat('%', #{unifiedSocialCreditCode}, '%')</if>
<if test="dateOfEstablishment != null "> and date_of_establishment = #{dateOfEstablishment}</if>
<if test="registrationAuthorityCity != null and registrationAuthorityCity != ''"> and registration_authority_city = #{registrationAuthorityCity}</if>
<if test="registrationAuthorityArea != null and registrationAuthorityArea != ''"> and registration_authority_area = #{registrationAuthorityArea}</if>
<if test="registeredCapital != null and registeredCapital != ''"> and registered_capital = #{registeredCapital}</if>
<if test="legalRepresentative != null and legalRepresentative != ''"> and legal_representative = #{legalRepresentative}</if>
<if test="headOfAnUnincorporatedOrganization != null and headOfAnUnincorporatedOrganization != ''"> and head_of_an_unincorporated_organization = #{headOfAnUnincorporatedOrganization}</if>
<if test="unitType != null and unitType != ''"> and unit_type = #{unitType}</if>
<if test="applicationLevel != null and applicationLevel != ''"> and application_level = #{applicationLevel}</if>
<if test="legalAuthorityName != null and legalAuthorityName != ''"> and legal_authority_name like concat('%', #{legalAuthorityName}, '%')</if>
<if test="legalAuthoritySex != null and legalAuthoritySex != ''"> and legal_authority_sex = #{legalAuthoritySex}</if>
<if test="legalAuthorityNationality != null and legalAuthorityNationality != ''"> and legal_authority_nationality = #{legalAuthorityNationality}</if>
<if test="legalAuthorityPoliticalStatus != null and legalAuthorityPoliticalStatus != ''"> and legal_authority_political_status = #{legalAuthorityPoliticalStatus}</if>
<if test="legalAuthorityWorkingDepartment != null and legalAuthorityWorkingDepartment != ''"> and legal_authority_working_department = #{legalAuthorityWorkingDepartment}</if>
<if test="legalAuthorityPosition != null and legalAuthorityPosition != ''"> and legal_authority_position = #{legalAuthorityPosition}</if>
<if test="legalAuthorityIdNumber != null and legalAuthorityIdNumber != ''"> and legal_authority_id_number = #{legalAuthorityIdNumber}</if>
<if test="contactNumber != null and contactNumber != ''"> and contact_number = #{contactNumber}</if>
<if test="basicInformationOfTheUnit != null and basicInformationOfTheUnit != ''"> and basic_information_of_the_unit = #{basicInformationOfTheUnit}</if>
<if test="corporate != null and corporate != ''"> and corporate = #{corporate}</if>
<if test="unincorporatedOrganizations != null and unincorporatedOrganizations != ''"> and unincorporated_organizations = #{unincorporatedOrganizations}</if>
<if test="approvalStatus != null and approvalStatus != ''"> and approval_status = #{approvalStatus}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="companyName != null and companyName != ''"> and t1.company_name like concat('%', #{companyName}, '%')</if>
<if test="unitResidence != null and unitResidence != ''"> and t1.unit_residence like concat('%', #{unitResidence}, '%')</if>
<if test="unifiedSocialCreditCode != null and unifiedSocialCreditCode != ''"> and t1.unified_social_credit_code like concat('%', #{unifiedSocialCreditCode}, '%')</if>
<if test="dateOfEstablishment != null "> and t1.date_of_establishment = #{dateOfEstablishment}</if>
<if test="registrationAuthorityCity != null and registrationAuthorityCity != ''"> and t1.registration_authority_city = #{registrationAuthorityCity}</if>
<if test="registrationAuthorityArea != null and registrationAuthorityArea != ''"> and t1.registration_authority_area = #{registrationAuthorityArea}</if>
<if test="registeredCapital != null and registeredCapital != ''"> and t1.registered_capital = #{registeredCapital}</if>
<if test="legalRepresentative != null and legalRepresentative != ''"> and t1.legal_representative = #{legalRepresentative}</if>
<if test="headOfAnUnincorporatedOrganization != null and headOfAnUnincorporatedOrganization != ''"> and t1.head_of_an_unincorporated_organization = #{headOfAnUnincorporatedOrganization}</if>
<if test="unitType != null and unitType != ''"> and t1.unit_type = #{unitType}</if>
<if test="applicationLevel != null and applicationLevel != ''"> and t1.application_level = #{applicationLevel}</if>
<if test="legalAuthorityName != null and legalAuthorityName != ''"> and t1.legal_authority_name like concat('%', #{legalAuthorityName}, '%')</if>
<if test="legalAuthoritySex != null and legalAuthoritySex != ''"> and t1.legal_authority_sex = #{legalAuthoritySex}</if>
<if test="legalAuthorityNationality != null and legalAuthorityNationality != ''"> and t1.legal_authority_nationality = #{legalAuthorityNationality}</if>
<if test="legalAuthorityPoliticalStatus != null and legalAuthorityPoliticalStatus != ''"> and t1.legal_authority_political_status = #{legalAuthorityPoliticalStatus}</if>
<if test="legalAuthorityWorkingDepartment != null and legalAuthorityWorkingDepartment != ''"> and t1.legal_authority_working_department = #{legalAuthorityWorkingDepartment}</if>
<if test="legalAuthorityPosition != null and legalAuthorityPosition != ''"> and t1.legal_authority_position = #{legalAuthorityPosition}</if>
<if test="legalAuthorityIdNumber != null and legalAuthorityIdNumber != ''"> and t1.legal_authority_id_number = #{legalAuthorityIdNumber}</if>
<if test="contactNumber != null and contactNumber != ''"> and t1.contact_number = #{contactNumber}</if>
<if test="basicInformationOfTheUnit != null and basicInformationOfTheUnit != ''"> and t1.basic_information_of_the_unit = #{basicInformationOfTheUnit}</if>
<if test="corporate != null and corporate != ''"> and t1.corporate = #{corporate}</if>
<if test="unincorporatedOrganizations != null and unincorporatedOrganizations != ''"> and t1.unincorporated_organizations = #{unincorporatedOrganizations}</if>
<if test="approvalStatus != null and approvalStatus != ''"> and t1.approval_status = #{approvalStatus}</if>
<if test="createBy != null and createBy != ''"> and t1.create_by = #{createBy}</if>
</where>
</select>

@ -19,6 +19,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="审核状态" prop="approvalStatus">
<el-select v-model="queryParams.approvalStatus" placeholder="请选择审核状态" clearable>
<el-option
v-for="dict in dict.type.approval_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="成立日期" prop="dateOfEstablishment">
<el-date-picker clearable
v-model="queryParams.dateOfEstablishment"
@ -145,14 +155,24 @@
<span>{{ parseTime(scope.row.dateOfEstablishment, '{y}-{m}-{d}') || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="登记机关" width="125" align="center" prop="registrationAuthorityCity" >
<el-table-column label="登记机关" width="125" align="center" prop="registrationAuthorityProvince" >
<template slot-scope="scope">
<span>{{ scope.row.registrationAuthorityCity || '--' }}</span>
<span>{{ scope.row.registrationAuthorityProvinceName || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="登记机关市" width="125" align="center" prop="registrationAuthorityCity" >
<template slot-scope="scope">
<span>{{ scope.row.registrationAuthorityCityName || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="登记机关区" width="125" align="center" prop="registrationAuthorityArea" >
<template slot-scope="scope">
<span>{{ scope.row.registrationAuthorityArea || '--' }}</span>
<span>{{ scope.row.registrationAuthorityAreaName || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="登记机关" width="125" align="center" prop="administrativeApprovalBureau" >
<template slot-scope="scope">
<span>{{ scope.row.administrativeApprovalBureau || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="注册资金(万元)" width="155" align="center" prop="registeredCapital" >
@ -239,6 +259,12 @@
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="approvalStatus">
<template slot-scope="scope">
<dict-tag v-if="scope.row.approvalStatus" :options="dict.type.approval_status" :value="scope.row.approvalStatus"/>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
@ -295,12 +321,19 @@
placeholder="请选择成立日期">
</el-date-picker>
</el-form-item>
<el-form-item label="登记机关县" prop="registrationAuthorityCity">
<el-input v-model="form.registrationAuthorityCity" placeholder="请输入登记机关县" />
<el-form-item label="登记机关省" prop="registrationAuthorityProvince">
<el-input v-model="form.registrationAuthorityProvince" placeholder="请输入登记机关省" />
</el-form-item>
<el-form-item label="登记机关市" prop="registrationAuthorityCity">
<el-input v-model="form.registrationAuthorityCity" placeholder="请输入登记机关市" />
</el-form-item>
<el-form-item label="登记机关区" prop="registrationAuthorityArea">
<el-input v-model="form.registrationAuthorityArea" placeholder="请输入登记机关区" />
</el-form-item>
<el-form-item label="行政审批局" prop="administrativeApprovalBureau">
<el-input v-model="form.administrativeApprovalBureau" placeholder="请输入行政审批局" />
</el-form-item>
<el-form-item label="注册资金(万元)" prop="registeredCapital">
<el-input v-model="form.registeredCapital" placeholder="请输入注册资金(万元)" />
</el-form-item>
@ -383,6 +416,15 @@
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="审核状态" prop="approvalStatus">
<el-radio-group v-model="form.approvalStatus">
<el-radio
v-for="dict in dict.type.approval_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -397,7 +439,7 @@ import { listMember, getMember, delMember, addMember, updateMember } from "@/api
export default {
name: "Member",
dicts: ['corporate', 'application_level',"sys_user_sex", 'unit_type', 'unincorporated_organizations'],
dicts: ['corporate', 'application_level',"sys_user_sex", 'unit_type', 'unincorporated_organizations','approval_status'],
data() {
var checkPhone = (rule, value, callback) => {//
const phoneReg = /^1[3|4|5|7|8|9][0-9]{9}$/
@ -451,6 +493,7 @@ export default {
headOfAnUnincorporatedOrganization: null,
unitType: null,
applicationLevel: null,
approvalStatus: null,
legalAuthorityName: null,
legalAuthoritySex: null,
legalAuthorityNationality: null,
@ -479,12 +522,18 @@ export default {
dateOfEstablishment:[
{required: true, message: '请选择成立日期', trigger: 'blur'},//
],
registrationAuthorityProvince:[
{required: true, message: '请输入登记机关省', trigger: 'blur'},//
],
registrationAuthorityCity:[
{required: true, message: '请输入登记机关县', trigger: 'blur'},//
],
registrationAuthorityArea:[
{required: true, message: '请输入登记机关区', trigger: 'blur'},//
],
administrativeApprovalBureau:[
{required: true, message: '请输入行政审批局', trigger: 'blur'},//
],
registeredCapital:[
{required: true, message: '请输入注册资金(万元)', trigger: 'blur'},//
],

@ -27,7 +27,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核状态" prop="approvalStatus">
<el-select v-model="queryParams.approvalStatus" placeholder="请选择审核状态" clearable>
<el-option
v-for="dict in dict.type.approval_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="非遗传承人级别" prop="intangibleCulturalHeritageInheritorLevel">
<el-select v-model="queryParams.intangibleCulturalHeritageInheritorLevel" clearable
placeholder="请选择非遗传承人级别">
@ -39,6 +48,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="传承项目名称" prop="nameOfInheritanceProject">
<el-input
v-model="queryParams.nameOfInheritanceProject"
clearable
placeholder="请输入所在单位名称"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所在单位名称" prop="nameOfTheUnit">
<el-input
v-model="queryParams.nameOfTheUnit"
@ -47,6 +65,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单位类型" prop="unitType">
<el-select v-model="queryParams.unitType" clearable placeholder="请选择单位类型">
<el-option
@ -160,11 +180,19 @@
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column align="center" label="传承项目名称" prop="nameOfInheritanceProject">
<template slot-scope="scope">
<span>{{ scope.row.nameOfInheritanceProject || '--' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="所在单位名称" prop="nameOfTheUnit">
<template slot-scope="scope">
<span>{{ scope.row.nameOfTheUnit || '--' }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="单位类型" prop="unitType">
<template slot-scope="scope">
<dict-tag v-if="scope.row.unitType" :options="dict.type.unit_type" :value="scope.row.unitType"/>
@ -214,6 +242,12 @@
<span v-else> -- </span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="approvalStatus">
<template slot-scope="scope">
<dict-tag v-if="scope.row.approvalStatus" :options="dict.type.approval_status" :value="scope.row.approvalStatus"/>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope">
<el-button
@ -297,6 +331,9 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="传承项目名称" prop="nameOfInheritanceProject">
<el-input v-model="form.nameOfInheritanceProject" placeholder="请输入所在传承项目名称"/>
</el-form-item>
<el-form-item label="所在单位名称" prop="nameOfTheUnit">
<el-input v-model="form.nameOfTheUnit" placeholder="请输入所在单位名称"/>
</el-form-item>
@ -393,6 +430,15 @@
</div>
<!-- <el-input v-model="form.myMainWorkExperience" placeholder="请输入内容" type="textarea"/>-->
</el-form-item>
<el-form-item label="审核状态" prop="approvalStatus">
<el-radio-group v-model="form.approvalStatus">
<el-radio
v-for="dict in dict.type.approval_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -413,7 +459,7 @@ import {
export default {
name: "Personalmember",
dicts: ['working_level', 'current_job', 'application_level', 'sys_user_sex', 'current_job', 'working_level', 'unit_type', 'intangible_cultural_heritage_inheritor_level'],
dicts: ['working_level', 'current_job', 'application_level','approval_status', 'sys_user_sex', 'current_job', 'working_level', 'unit_type', 'intangible_cultural_heritage_inheritor_level'],
data() {
var checkPhone = (rule, value, callback) => {//
const phoneReg = /^1[3|4|5|7|8|9][0-9]{9}$/

Loading…
Cancel
Save