1.许可

tangzy

2021-11-05 425fb772c347a85fe8c9cb38a7a386d6368402cd

1.许可

 src/main/java/org/springblade/modules/FTP/monitor.java

@@ -20,7 +20,6 @@
    public static boolean isFTPFileExist() {

        FTPClient ftp = new FTPClient();

        try {

            // 连接ftp服务器
@@ -31,7 +30,6 @@
            // 登陆

            ftp.login(ftpUserName, ftpPassword);

            // 检验登陆操作的返回码是否正确

            if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.java

@@ -68,4 +68,5 @@
     * @param deptId
     */
    void deleteUserByDeptId(@Param("deptId") String deptId);
    String selJurchilder(String id);
}

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml

@@ -403,4 +403,11 @@
    <update id="deleteUserByDeptId">
        update blade_user set is_deleted = 1 where dept_id = #{deptId}
    </update>
    <!--查辖区的子数据-->
    <select id="selJurchilder" resultType="java.lang.String">
        SELECT GROUP_CONCAT(id) as id
        FROM sys_jurisdiction
        WHERE parent_id = #{id}
    </select>

</mapper>

 src/main/java/org/springblade/modules/information/service/IInformationService.java

@@ -79,4 +79,5 @@
     * @param deptId
     */
    void deleteUserByDeptId(String deptId);
    String selJurchilder(String id);
}

 src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java

@@ -186,4 +186,9 @@
    public void deleteUserByDeptId(String deptId) {
        baseMapper.deleteUserByDeptId(deptId);
    }

    @Override
    public String selJurchilder(String id) {
        return baseMapper.selJurchilder(id);
    }
}

 src/main/java/org/springblade/modules/permit/controller/PermitController.java

@@ -124,7 +124,21 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入permit")
    public R<IPage<PermitVO>> page(PermitVO permit, Query query) {
        IPage<PermitVO> pages = permitService.selectPermitPage(Condition.getPage(query), permit);
        IPage<PermitVO> pages;
        if (permit.getUsetype().equals("0")) {
            pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
        } else if (permit.getUsetype().equals("1")) {
            String childer = informationService.selJurchilder(permit.getJurisdiction());
            String[] split = childer.split(",");
            String strArrays = "";
            for (int j = 0; j < split.length; j++) {
                strArrays += "'" + split[j] + "',";
            }
            String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
            pages = permitService.selectPermitPage(Condition.getPage(query), permit, jurisdiction);
        } else {
            pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
        }
        return R.data(pages);
    }

@@ -146,22 +160,21 @@
        permit.setStorage("1");
        permit.setPermitime(new Date());
        permitService.save(permit);
        String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
        //String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
        String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
        String s = "insert into sys_permit(id,creditCode,enterpriseName,representative," +
            "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
            "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
            "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
            "values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
            + permit.getRepresentative() + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
            + permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
            "'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
            permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
            permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
            + permit.getType() + "'" + "," +
            "'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
            + permit.getType() + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
            "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
            + permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
            "," + "'" + permit.getCardid() + "'"+ "," + "'" + overtime+ "'" + ")";
            "," + "'" + permit.getCardid() + "'" + "," + "'" + overtime + "'" + ")";
        FtpUtil.sqlFileUpload(s);
        return R.success("许可提交成功");
    }

 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.java

@@ -41,7 +41,7 @@
     * @param permit
     * @return
     */
    List<PermitVO> selectPermitPage(IPage page, PermitVO permit);
    List<PermitVO> selectPermitPage(IPage page, @Param("permit") PermitVO permit,String jurisdiction);

    Map selectIn(String cardid,String type);
    void insertPer(@Param("permit") Permit permit);

 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml

@@ -35,14 +35,23 @@


    <select id="selectPermitPage" resultMap="permitResultMap">
        select *
        from sys_permit
        select * from sys_permit where 1=1
        <if test="permit.ptype!=null and permit.ptype!=''">
              and  ptype=#{permit.ptype}
        </if>
        <if test="permit.usetype=='1'.toString()">
            and jurisdiction in(${jurisdiction})
        </if>
        <if test="permit.usetype=='2'.toString()">
            and  jurisdiction=#{permit.jurisdiction}
        </if>
    </select>

    <select id="selectIn" resultType="java.util.HashMap">
        select *
        from sys_permit
        where cardid = #{cardid} and ptype=#{type }
        where cardid = #{cardid}
          and ptype = #{type }
    </select>

    <insert id="insertPer" useGeneratedKeys="true" keyProperty="id">

 src/main/java/org/springblade/modules/permit/service/IPermitService.java

@@ -39,7 +39,7 @@
     * @param permit
     * @return
     */
    IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, PermitVO permit);
    IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, @Param("permit") PermitVO permit,String jurisdiction);
    Map selectIn(String cardid,String type);
    void insertPer(@Param("permit") Permit permit);
}

 src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java

@@ -36,8 +36,8 @@
public class PermitServiceImpl extends ServiceImpl<PermitMapper, Permit> implements IPermitService {

    @Override
    public IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, PermitVO permit) {
        return page.setRecords(baseMapper.selectPermitPage(page, permit));
    public IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, PermitVO permit,String jurisdiction) {
        return page.setRecords(baseMapper.selectPermitPage(page, permit,jurisdiction));
    }

    @Override

 src/main/java/org/springblade/modules/permit/vo/PermitVO.java

@@ -32,5 +32,5 @@
@ApiModel(value = "PermitVO对象", description = "PermitVO对象")
public class PermitVO extends Permit {
    private static final long serialVersionUID = 1L;

    private  String usetype;
}

 src/main/java/org/springblade/modules/record/controller/RecordController.java

@@ -35,6 +35,7 @@
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
@@ -101,7 +102,22 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入record")
    public R<IPage<RecordVO>> page(RecordVO record, Query query) {
        IPage<RecordVO> pages = recordService.selectRecordPage(Condition.getPage(query), record);
        IPage<RecordVO> pages;
        if (record.getUsetype().equals("0")) {
            pages = recordService.selectRecordPage(Condition.getPage(query), record, null);
        } else if (record.getUsetype().equals("1")) {
            String childer = informationService.selJurchilder(record.getJurisdiction());
            String[] split = childer.split(",");
            String strArrays = "";
            for (int j = 0; j < split.length; j++) {
                strArrays += "'" + split[j] + "',";
            }
            String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
            pages = recordService.selectRecordPage(Condition.getPage(query), record, jurisdiction);
        } else {
            pages = recordService.selectRecordPage(Condition.getPage(query), record, null);
        }

        return R.data(pages);
    }

@@ -114,26 +130,27 @@
    public R save(@Valid @RequestBody Record record) {
        String cardid = record.getCardid();
        String type = record.getPtype();
        Map map = recordService.selectIn(cardid,type);
        Map map = recordService.selectIn(cardid, type);
        if (map != null) {
            String id = map.get("id").toString();
            recordService.removeByIds(Func.toLongList(id));
            String s1 = "delete from sys_record where id = " + "'" + id + "'";
            FtpUtil.sqlFileUpload(s1);
        }
        record.setStorage("1");
        record.setType("2");
        record.setPermitime(new Date());
        recordService.save(record);
        String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
        String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
        String s = "insert into sys_record(id,enterpriseName,representative," +
            "address,business,registration,industry,type,permitime,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction,cardid,storage,overtime)" +
            "values(" + "'" + record.getId() + "'"+ "," + "'" + record.getEnterprisename() + "'" + "," +
            "'" + record.getRepresentative() + "'"+ "," + "'" +
            record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getPtype() + "'" + "," +
            "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," +"'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," +
            "'" + offtime + "'" + "," + "'" + record.getJurisdiction() + "'" +
            "," + "'" + record.getCardid() + "'"+
            "," + "'" + record.getStorage() + "'"+
        //String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
        //String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
        String s = "insert into sys_record(id,representative," +
            "address,business,registration,industry,type,ptype,representativecell,contacts,contactscell,perid,offices,jurisdiction,cardid,storage,overtime)" +
            "values(" + "'" + record.getId() + "'" + "," +
            "'" + record.getRepresentative() + "'" + "," + "'" +
            record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + record.getPtype() + "'" + "," +
            "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," + "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + record.getJurisdiction() + "'" +
            "," + "'" + record.getCardid() + "'" +
            "," + "'" + record.getStorage() + "'" +
            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOvertime()) + "'"
            + ")";
        FtpUtil.sqlFileUpload(s);
@@ -149,7 +166,7 @@
    public R rocordsave(@Valid @RequestBody Record record) {
        String cardid = record.getCardid();
        String type = record.getPtype();
        Map map = recordService.selectIn(cardid,type);
        Map map = recordService.selectIn(cardid, type);
        if (map != null) {
            record.setStorage("0");
            record.setPermitime(new Date());
@@ -173,7 +190,7 @@
        //审核通过
        if (record.getType().equals("0")) {
            //新增组织机构和单位信息
            Information information =new Information();
            Information information = new Information();
            information.setCreditcode(record.getCreditcode());
            information.setEnterprisename(record.getEnterprisename());
            information.setRepresentative(record.getRepresentative());
@@ -192,7 +209,7 @@
            information.setContactscell(record.getContactscell());
            Dept dept = new Dept();
            //本市公司
            if (record.getPtype().equals("2")){
            if (record.getPtype().equals("2")) {
                Long i = 1425366663452196865L;
                dept.setParentId(i);
                dept.setAncestors("0,1425366663452196865");
@@ -222,26 +239,25 @@
            user.setPassword(initPassword);
            boolean b = userService.saveOrUpdate(user);
            //把附件添加单位id
            attachService.updat(information.getDepartmentid(),record.getCardid());
            attachService.updat(information.getDepartmentid(), record.getCardid());
            String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
                ",papprove = " + "'" + record.getPapprove() + "'"+
                ",xapprove = " + "'" + record.getXapprove() + "'"+
                ",sapprove = " + "'" + record.getSapprove() + "'"+
                ",popinion = " + "'" + record.getPopinion() + "'"+
                ",sopinion = " + "'" + record.getSopinion() + "'"+
                ",xopinion = " + "'" + record.getXopinion() + "'"+
                " " +"where id = " + "'" + record.getId() + "'";
                ",papprove = " + "'" + record.getPapprove() + "'" +
                ",xapprove = " + "'" + record.getXapprove() + "'" +
                ",sapprove = " + "'" + record.getSapprove() + "'" +
                ",popinion = " + "'" + record.getPopinion() + "'" +
                ",sopinion = " + "'" + record.getSopinion() + "'" +
                ",xopinion = " + "'" + record.getXopinion() + "'" +
                " " + "where id = " + "'" + record.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        }
        else {
        } else {
            String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
                ",papprove = " + "'" + record.getPapprove() + "'"+
                ",xapprove = " + "'" + record.getXapprove() + "'"+
                ",sapprove = " + "'" + record.getSapprove() + "'"+
                ",popinion = " + "'" + record.getPopinion() + "'"+
                ",sopinion = " + "'" + record.getSopinion() + "'"+
                ",xopinion = " + "'" + record.getXopinion() + "'"+
                " " +"where id = " + "'" + record.getId() + "'";
                ",papprove = " + "'" + record.getPapprove() + "'" +
                ",xapprove = " + "'" + record.getXapprove() + "'" +
                ",sapprove = " + "'" + record.getSapprove() + "'" +
                ",popinion = " + "'" + record.getPopinion() + "'" +
                ",sopinion = " + "'" + record.getSopinion() + "'" +
                ",xopinion = " + "'" + record.getXopinion() + "'" +
                " " + "where id = " + "'" + record.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        }
        return R.status(recordService.saveOrUpdate(record));
@@ -270,8 +286,8 @@


    @PostMapping("/selectIn")
    public R selectIn(String cardid,String type) {
        Map map = recordService.selectIn(cardid,type);
    public R selectIn(String cardid, String type) {
        Map map = recordService.selectIn(cardid, type);
        return R.data(map);
    }
}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.vo.RecordVO;

@@ -39,6 +40,6 @@
     * @param record
     * @return
     */
    List<RecordVO> selectRecordPage(IPage page, RecordVO record);
    List<RecordVO> selectRecordPage(IPage page, @Param("record") RecordVO record, String jurisdiction);
    Map selectIn(String cardid,String type);
}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml

@@ -43,7 +43,25 @@


    <select id="selectRecordPage" resultMap="recordResultMap">
        select * from sys_record
        select * from sys_record where 1=1
        <if test="record.ptype!=null and record.ptype!=''">
            and  ptype=#{record.ptype}
        </if>
        <if test="record.usetype=='1'.toString()">
            and jurisdiction in(${jurisdiction})
        </if>
        <if test="record.usetype=='2'.toString()">
            and  jurisdiction=#{record.jurisdiction}
        </if>
        <if test="record.papprove!=null and record.papprove!=''">
            and  papprove=#{record.papprove}
        </if>
        <if test="record.xapprove!=null and record.xapprove!=''">
            and  xapprove=#{record.xapprove}
        </if>
        <if test="record.sapprove!=null and record.sapprove!=''">
            and  sapprove=#{record.sapprove}
        </if>
    </select>

    <select id="selectIn" resultType="java.util.HashMap">

 src/main/java/org/springblade/modules/record/service/IRecordService.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.vo.RecordVO;

@@ -38,6 +39,6 @@
     * @param record
     * @return
     */
    IPage<RecordVO> selectRecordPage(IPage<RecordVO> page, RecordVO record);
    IPage<RecordVO> selectRecordPage(IPage<RecordVO> page, @Param("record") RecordVO record, String jurisdiction);
    Map selectIn(String cardid,String type);
}

 src/main/java/org/springblade/modules/record/service/impl/RecordServiceImpl.java

@@ -36,8 +36,8 @@
public class RecordServiceImpl extends ServiceImpl<RecordMapper, Record> implements IRecordService {

    @Override
    public IPage<RecordVO> selectRecordPage(IPage<RecordVO> page, RecordVO record) {
        return page.setRecords(baseMapper.selectRecordPage(page, record));
    public IPage<RecordVO> selectRecordPage(IPage<RecordVO> page, RecordVO record,String jurisdiction) {
        return page.setRecords(baseMapper.selectRecordPage(page, record,jurisdiction));
    }

    @Override

 src/main/java/org/springblade/modules/record/vo/RecordVO.java

@@ -32,5 +32,5 @@
@ApiModel(value = "RecordVO对象", description = "RecordVO对象")
public class RecordVO extends Record {
    private static final long serialVersionUID = 1L;

   private  String usetype;
}

 src/main/java/org/springblade/modules/recordk/vo/RecordkVO.java

@@ -32,5 +32,6 @@
@ApiModel(value = "RecordkVO对象", description = "RecordkVO对象")
public class RecordkVO extends Recordk {
    private static final long serialVersionUID = 1L;
    private String usetype;

}

 src/main/java/org/springblade/modules/revoke/controller/RevokeController.java

@@ -28,6 +28,8 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.revoke.entity.Revoke;
import org.springblade.modules.revoke.service.IRevokeService;
import org.springblade.modules.revoke.vo.RevokeVO;
@@ -51,7 +53,7 @@
public class RevokeController extends BladeController {

    private final IRevokeService revokeService;

    private final IInformationService informationService;
    /**
     * 详情
     */
@@ -82,7 +84,22 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入revoke")
    public R<IPage<RevokeVO>> page(RevokeVO revoke, Query query) {
        IPage<RevokeVO> pages = revokeService.selectRevokePage(Condition.getPage(query), revoke);
        IPage<RevokeVO> pages;
        if (revoke.getUsetype().equals("0")) {
            pages = revokeService.selectRevokePage(Condition.getPage(query), revoke,null);
        } else if (revoke.getUsetype().equals("1")) {
            String childer = informationService.selJurchilder(revoke.getJurisdiction());
            String[] split = childer.split(",");
            String strArrays = "";
            for (int j = 0; j < split.length; j++) {
                strArrays += "'" + split[j] + "',";
            }
            String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
            pages =revokeService.selectRevokePage(Condition.getPage(query), revoke,jurisdiction);
        } else {
            pages =revokeService.selectRevokePage(Condition.getPage(query), revoke,null);
        }

        return R.data(pages);
    }

@@ -104,20 +121,18 @@
        revoke.setType("2");
        revoke.setPermitime(new Date());
        revokeService.save(revoke);
        String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getEstablishtime());
        String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getPermitime());
        String s = "insert into sys_revoke(id,creditCode,enterpriseName,representative,establishTime," +
        //String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getEstablishtime());
        //String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getPermitime());
        String s = "insert into sys_revoke(id,creditCode,enterpriseName,representative," +
            "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
            "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,reason,jurisdiction,cardid)" +
            "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,reason,jurisdiction,cardid)" +
            "values(" + "'" + revoke.getId() + "'" + "," + "'" + revoke.getCreditcode() + "'" + "," + "'" + revoke.getEnterprisename() + "'" + "," + "'"
            + revoke.getRepresentative() + "'" + "," +
            "'" + formatStr + "'" + "," + "'" + revoke.getRegisteredcapital() + "'" + "," + "'"
            + revoke.getRepresentative() + "'" + "," + "'" + revoke.getRegisteredcapital() + "'" + "," + "'"
            + revoke.getOrganizationcode() + "'" + "," + "'" + revoke.getRegistrationnumber() + "'" + "," +
            "'" + revoke.getIdentificationnumber() + "'" + "," + "'" + revoke.getEnterprises() + "'" + "," + "'" +
            revoke.getAddress() + "'" + "," + "'" + revoke.getBusiness() + "'" + "," + "'" +
            revoke.getRegion() + "'" + "," + "'" + revoke.getRegistration() + "'" + "," + "'" + revoke.getIndustry() + "'" + "," + "'"
            + revoke.getType() + "'" + "," +
            "'" + pertime + "'" + "," + "'" + revoke.getDeptid() + "'" + "," + "'" + revoke.getPtype() + "'" + "," +
            + revoke.getType() + "'" + "," + "'" + revoke.getDeptid() + "'" + "," + "'" + revoke.getPtype() + "'" + "," +
            "'" + revoke.getRepresentativecell() + "'" + "," + "'" + revoke.getContacts() + "'" + "," + "'" + revoke.getContactscell() + "'" + "," +
            "'" + revoke.getReason() + "'" + "," + "'" + revoke.getJurisdiction() + "'" +"," + "'" + revoke.getCardid() + "'"+ ")";
        FtpUtil.sqlFileUpload(s);

 src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.revoke.entity.Revoke;
import org.springblade.modules.revoke.vo.RevokeVO;

@@ -39,6 +40,6 @@
     * @param revoke
     * @return
     */
    List<RevokeVO> selectRevokePage(IPage page, RevokeVO revoke);
    List<RevokeVO> selectRevokePage(IPage page, @Param("revoke") RevokeVO revoke, String jurisdiction);
    Map selectIn(String cardid,String type);
}

 src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml

@@ -37,7 +37,16 @@


    <select id="selectRevokePage" resultMap="revokeResultMap">
        select * from sys_revoke
        select * from sys_revoke where 1=1
        <if test="revoke.ptype!=null and revoke.ptype!=''">
            and  ptype=#{revoke.ptype}
        </if>
        <if test="revoke.usetype=='1'.toString()">
            and jurisdiction in(${jurisdiction})
        </if>
        <if test="revoke.usetype=='2'.toString()">
            and  jurisdiction=#{revoke.jurisdiction}
        </if>
    </select>
    <select id="selectIn" resultType="java.util.HashMap">
        select * from sys_revoke where cardid=#{cardid} and ptype=#{type}

 src/main/java/org/springblade/modules/revoke/service/IRevokeService.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.revoke.entity.Revoke;
import org.springblade.modules.revoke.vo.RevokeVO;

@@ -38,6 +39,6 @@
     * @param revoke
     * @return
     */
    IPage<RevokeVO> selectRevokePage(IPage<RevokeVO> page, RevokeVO revoke);
    IPage<RevokeVO> selectRevokePage(IPage<RevokeVO> page, @Param("revoke") RevokeVO revoke, String jurisdiction);
    Map selectIn(String cardid,String type);
}

 src/main/java/org/springblade/modules/revoke/service/impl/RevokeServiceImpl.java

@@ -36,8 +36,8 @@
public class RevokeServiceImpl extends ServiceImpl<RevokeMapper, Revoke> implements IRevokeService {

    @Override
    public IPage<RevokeVO> selectRevokePage(IPage<RevokeVO> page, RevokeVO revoke) {
        return page.setRecords(baseMapper.selectRevokePage(page, revoke));
    public IPage<RevokeVO> selectRevokePage(IPage<RevokeVO> page, RevokeVO revoke,String jurisdiction) {
        return page.setRecords(baseMapper.selectRevokePage(page, revoke,jurisdiction));
    }

    @Override

 src/main/java/org/springblade/modules/revoke/vo/RevokeVO.java

@@ -32,5 +32,5 @@
@ApiModel(value = "RevokeVO对象", description = "RevokeVO对象")
public class RevokeVO extends Revoke {
    private static final long serialVersionUID = 1L;

    private String usetype;
}

 src/main/java/org/springblade/modules/shareholder/controller/ShareholderController.java

@@ -102,18 +102,32 @@
    @ApiOperation(value = "新增", notes = "传入shareholder")
    public R save(@Valid @RequestBody Shareholder shareholder) throws Exception {
        boolean save = shareholderService.save(shareholder);
        String s1 =
            "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,capitalTime,cardid,cell,creditCode,dept_id) " +
                "values(" + "'" + shareholder.getId() + "'" + "," +
                "'" + shareholder.getShareholder() + "'" + "," +
                "'" + shareholder.getShareholdingratio() + "'" + "," +
                "'" + shareholder.getCapital() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd").format(shareholder.getCapitaltime()) + "'"+"," +
                "'" + shareholder.getCardid() + "'"+"," +
                "'" + shareholder.getCell() + "'"+"," +
                "'" + shareholder.getCreditcode() + "'"+"," +
                "'" + shareholder.getDeptId() + "'" + ")";
        FtpUtil.sqlFileUpload(s1);
        if (shareholder.getCapitaltime() == null) {
            String s1 =
                "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,cardid,cell,creditCode,dept_id) " +
                    "values(" + "'" + shareholder.getId() + "'" + "," +
                    "'" + shareholder.getShareholder() + "'" + "," +
                    "'" + shareholder.getShareholdingratio() + "'" + "," +
                    "'" + shareholder.getCapital() + "'" + "," +
                    "'" + shareholder.getCardid() + "'" + "," +
                    "'" + shareholder.getCell() + "'" + "," +
                    "'" + shareholder.getCreditcode() + "'" + "," +
                    "'" + shareholder.getDeptId() + "'" + ")";
            FtpUtil.sqlFileUpload(s1);
        } else {
            String s1 =
                "insert into sys_shareholder(id,shareholder,shareholdingratio,capital,capitalTime,cardid,cell,creditCode,dept_id) " +
                    "values(" + "'" + shareholder.getId() + "'" + "," +
                    "'" + shareholder.getShareholder() + "'" + "," +
                    "'" + shareholder.getShareholdingratio() + "'" + "," +
                    "'" + shareholder.getCapital() + "'" + "," +
                    "'" + new SimpleDateFormat("yyyy-MM-dd").format(shareholder.getCapitaltime()) + "'" + "," +
                    "'" + shareholder.getCardid() + "'" + "," +
                    "'" + shareholder.getCell() + "'" + "," +
                    "'" + shareholder.getCreditcode() + "'" + "," +
                    "'" + shareholder.getDeptId() + "'" + ")";
            FtpUtil.sqlFileUpload(s1);
        }
        return R.status(save);
    }

@@ -125,17 +139,30 @@
    @ApiOperation(value = "修改", notes = "传入shareholder")
    public R update(@Valid @RequestBody Shareholder shareholder) throws Exception {
        boolean b = shareholderService.updateById(shareholder);
        //内网同步
        String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +
            ",shareholdingratio = " + "'" + shareholder.getShareholdingratio() + "'" +
            ",capital = " + "'" + shareholder.getCapital() + "'" +
            ",capitalTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(shareholder.getCapitaltime()) + "'" +
            ",cardid = " + "'" + shareholder.getCardid() + "'" +
            ",cell = " + "'" + shareholder.getCell() + "'" +
            ",creditCode = " + "'" + shareholder.getCreditcode() + "'" +
            ",dept_id = " + "'" + shareholder.getDeptId() + "'" +
            " " + "where id = " + "'" + shareholder.getId() + "'";
        FtpUtil.sqlFileUpload(s1);
        if (shareholder.getCapitaltime() == null) {
            //内网同步
            String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +
                ",shareholdingratio = " + "'" + shareholder.getShareholdingratio() + "'" +
                ",capital = " + "'" + shareholder.getCapital() + "'" +
                ",cardid = " + "'" + shareholder.getCardid() + "'" +
                ",cell = " + "'" + shareholder.getCell() + "'" +
                ",creditCode = " + "'" + shareholder.getCreditcode() + "'" +
                ",dept_id = " + "'" + shareholder.getDeptId() + "'" +
                " " + "where id = " + "'" + shareholder.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        } else {
            //内网同步
            String s1 = "update sys_shareholder set shareholder = " + "'" + shareholder.getShareholder() + "'" +
                ",shareholdingratio = " + "'" + shareholder.getShareholdingratio() + "'" +
                ",capital = " + "'" + shareholder.getCapital() + "'" +
                ",capitalTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(shareholder.getCapitaltime()) + "'" +
                ",cardid = " + "'" + shareholder.getCardid() + "'" +
                ",cell = " + "'" + shareholder.getCell() + "'" +
                ",creditCode = " + "'" + shareholder.getCreditcode() + "'" +
                ",dept_id = " + "'" + shareholder.getDeptId() + "'" +
                " " + "where id = " + "'" + shareholder.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        }
        return R.status(b);
    }

@@ -168,12 +195,13 @@

    /**
     * 出资人信息
     *
     * @param shareholderVO
     * @return
     */
    @PostMapping("/selectShareholderInfo")
    public R<IPage<ShareholderVO>> selectShareholderInfo(ShareholderVO shareholderVO, Query query) {
        IPage<ShareholderVO> pages=shareholderService.selectShareholderInfo(Condition.getPage(query), shareholderVO);
        IPage<ShareholderVO> pages = shareholderService.selectShareholderInfo(Condition.getPage(query), shareholderVO);
        return R.data(pages);
    }


 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -610,12 +610,14 @@
    }

    @GetMapping("/zc")
    public R zc(String username, String password) {
    public R zc(String username, String password,String phone) {
        User user = new User();
        user.setTenantId("000000");
        user.setAccount(username);
        user.setPassword(DigestUtil.encrypt(password));
        user.setDeptId("1426355050199945218");
        user.setRoleId("1428177141018771458");
        user.setPhone(phone);
        userService.saveOrUpdate(user);
        return R.success("注册成功");
    }