居住证审核+从业人员优化

lin

2024-03-21 b5837609dcd4417904eaaa5924de46010443affd

居住证审核+从业人员优化

 src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java

@@ -109,6 +109,16 @@
    }

    /**
     * 场所从业人员 修改
     */
    @PostMapping("/auditing")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入placePractitioner")
    public R auditing(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
        return R.status(placePractitionerService.auditing(placePractitioner));
    }

    /**
     * 场所从业人员 新增或修改
     */
    @PostMapping("/submit")

 src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java

@@ -118,4 +118,25 @@
    @TableField("resignation_flag")
    private Integer resignationFlag;

    /** 审核确认人用户id */
    @ApiModelProperty(value = "审核确认人用户id", example = "")
    @TableField("confirm_user_id")
    private Long confirmUserId;

    /** 确认标记 1：待审核  2：审核通过  3：审核不通过 4:待完善 */
    @ApiModelProperty(value = "确认标记 1：待审核  2：审核通过  3：审核不通过 4:待完善", example = "")
    @TableField("confirm_flag")
    private Integer confirmFlag;

    /** 审核确认时间 */
    @ApiModelProperty(value = "审核确认时间", example = "")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("confirm_time")
    private Date confirmTime;

    /** 审核意见 */
    @ApiModelProperty(value = "审核意见", example = "")
    @TableField("confirm_notion")
    private String confirmNotion;

}

 src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml

@@ -23,6 +23,10 @@
        jpp.employment_time,
        jpp.resignation_time,
        jpp.resignation_flag,
        jpp.confirm_user_id,
        jpp.confirm_flag,
        jpp.confirm_time,
        jpp.confirm_notion,
        jc.category_name
        FROM
        jczz_place_practitioner jpp
@@ -61,6 +65,11 @@
            <if test="placePractitioner.createTime != null ">and jpp.create_time = #{placePractitioner.createTime}</if>
            <if test="placePractitioner.ethnicity != null ">and jpp.ethnicity = #{placePractitioner.ethnicity}</if>

            <if test="placePractitioner.confirmUserId != null "> and confirm_user_id = #{placePractitioner.confirmUserId}</if>
            <if test="placePractitioner.confirmFlag != null "> and confirm_flag = #{placePractitioner.confirmFlag}</if>
            <if test="placePractitioner.confirmTime != null "> and confirm_time = #{placePractitioner.confirmTime}</if>
            <if test="placePractitioner.confirmNotion != null  and placePractitioner.confirmNotion != ''"> and confirm_notion = #{placePractitioner.confirmNotion}</if>

            <if test="placePractitioner.type == 1">
                and TIMESTAMPDIFF(year, substring(jpp.id_card, 7, 8), now()) &lt; 18
                and jc.category_no in (180202,180201)

 src/main/java/org/springblade/modules/place/service/IPlacePractitionerService.java

@@ -41,4 +41,11 @@


    Object countByType(PlacePractitionerVO placePractitioner);

    /**
     * 审核
     * @param placePractitioner
     * @return
     */
    Boolean auditing(PlacePractitionerEntity placePractitioner);
}

 src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java

@@ -16,8 +16,10 @@
 */
package org.springblade.modules.place.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.constant.CommonConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springblade.modules.place.mapper.PlacePractitionerMapper;
@@ -26,6 +28,7 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.Date;
import java.util.HashMap;
import java.util.Map;

@@ -46,6 +49,7 @@

    /**
     * 统计少数民族和未成年数量
     *
     * @return
     */
    @Override
@@ -61,4 +65,18 @@
        resultMap.put("nationalMinority",nationalMinority);
        return resultMap;
    }

    @Override
    public Boolean auditing(PlacePractitionerEntity placePractitioner) {
        placePractitioner.setConfirmUserId(AuthUtil.getUserId());
        placePractitioner.setConfirmTime(new Date());
        boolean update = update(Wrappers.<PlacePractitionerEntity>lambdaUpdate()
            .set(PlacePractitionerEntity::getConfirmFlag, placePractitioner.getConfirmFlag())
            .set(PlacePractitionerEntity::getConfirmNotion, placePractitioner.getConfirmNotion())
            .set(PlacePractitionerEntity::getConfirmUserId, placePractitioner.getConfirmUserId())
            .eq(PlacePractitionerEntity::getPlaceId, placePractitioner.getPlaceId())
            .eq(PlacePractitionerEntity::getResignationFlag, 1)
            .eq(PlacePractitionerEntity::getIsDeleted,0));
        return update;
    }
}

 src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java

@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;

import javax.validation.Valid;

import org.springblade.core.mp.support.Condition;
@@ -35,6 +36,8 @@
import org.springblade.modules.task.wrapper.TaskResidencePermitApplyWrapper;
import org.springblade.modules.task.service.ITaskResidencePermitApplyService;
import org.springblade.core.boot.ctrl.BladeController;

import java.util.Date;

/**
 * 居住证申请 控制器
@@ -60,6 +63,7 @@
        TaskResidencePermitApplyEntity detail = taskResidencePermitApplyService.getOne(Condition.getQueryWrapper(taskResidencePermitApply));
        return R.data(TaskResidencePermitApplyWrapper.build().entityVO(detail));
    }

    /**
     * 居住证申请 分页
     */
@@ -69,7 +73,7 @@
    public R<IPage<TaskResidencePermitApplyVO>> list(TaskResidencePermitApplyEntity taskResidencePermitApply, Query query) {
        // 查询自己的记录
        taskResidencePermitApply.setCreateUser(AuthUtil.getUserId());
        IPage<TaskResidencePermitApplyEntity> pages = taskResidencePermitApplyService.page(Condition.getPage(query), Condition.getQueryWrapper(taskResidencePermitApply));
        IPage<TaskResidencePermitApplyEntity> pages = taskResidencePermitApplyService.page(Condition.getPage(query), Condition.getQueryWrapper(taskResidencePermitApply).orderByDesc("create_time"));
        return R.data(TaskResidencePermitApplyWrapper.build().pageVO(pages));
    }

@@ -103,7 +107,6 @@
    public R update(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
        return R.status(taskResidencePermitApplyService.updateById(taskResidencePermitApply));
    }

    /**
     * 居住证申请 审核
     */

 src/main/java/org/springblade/modules/task/service/impl/TaskResidencePermitApplyServiceImpl.java

@@ -48,6 +48,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -67,7 +68,7 @@
    @Override
    public IPage<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage<TaskResidencePermitApplyVO> page, TaskResidencePermitApplyVO taskResidencePermitApply) {
        CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskResidencePermitApplyVO.class, taskResidencePermitApply);
        if(taskResidencePermitApply.getRoleName().equals("inhabitant")){
        if (taskResidencePermitApply.getRoleName() != null && taskResidencePermitApply.getRoleName().equals("inhabitant")) {
            taskResidencePermitApply.setCreateUser(AuthUtil.getUserId());
        }
        return page.setRecords(baseMapper.selectTaskResidencePermitApplyPage(page, taskResidencePermitApply,
@@ -111,6 +112,8 @@

    @Override
    public Boolean updateResidencePermitApplyEntity(TaskResidencePermitApplyEntity taskResidencePermitApply) {
        taskResidencePermitApply.setConfirmTime(new Date());
        taskResidencePermitApply.setConfirmUserId(AuthUtil.getUserId());
        boolean b = updateById(taskResidencePermitApply);
        if (b) {
            TaskResidencePermitApplyEntity entity = getById(taskResidencePermitApply.getId());