tangzy
2021-08-25 02c1cdc64b62e5248b7b5bdadcfd5cc661b43248
1.单位
9 files modified
67 ■■■■ changed files
src/main/java/org/springblade/modules/permit/controller/PermitController.java 38 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/permit/entity/Permit.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/record/controller/RecordController.java 19 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/record/entity/Record.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/revoke/entity/Revoke.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -145,7 +145,7 @@
        String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
        String s = "insert into sys_permit(id,creditCode,enterpriseName,representative,establishTime," +
            "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
            "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell)" +
            "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction)" +
            "values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
            + permit.getRepresentative() + "'" + "," +
            "'" + formatStr + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
@@ -155,7 +155,7 @@
            permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry()+ "'" + "," + "'"
            + permit.getType() + "'" + "," +
            "'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
            "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'" + permit.getContactscell() + "'"+")" ;
            "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'" + permit.getContactscell() + "'"+"," + "'" + permit.getJurisdiction() + "'"+")" ;
        FtpUtil.sqlFileUpload(s);
        return R.success("新增成功");
    }
@@ -171,34 +171,6 @@
        if (map != null) {
            permit.setStorage("0");
            permitService.updateById(permit);
//            String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getEstablishtime());
//            String s1 =
//                "update sys_permit set creditCode = " + "'" + permit.getCreditcode()+ "'"
//                    + ",enterpriseName = " + "'" + permit.getEnterprisename()+"'"
//                    + ",representative = " + "'" + permit.getRepresentative()+"'"
//                    + ",establishTime = " + "'" + formatStr+"'"
//                    + ",registeredCapital = " + "'" + permit.getRegisteredcapital()+"'"
//                    + ",organizationCode = " + "'" + permit.getOrganizationcode()+"'"
//                    + ",registrationNumber = " + "'" +permit.getRegistrationnumber()+"'"
//                    + ",identificationNumber = " + "'" + permit.getIdentificationnumber()+"'"
//                    + ",enterprises = " + "'" + permit.getEnterprises()+"'"
//                    + ",address = " + "'" + permit.getAddress()+"'"
//                    + ",business = " + "'" + permit.getBusiness()+"'"
//                    + ",region = " + "'" + permit.getRegion()+"'"
//                    + ",registration = " + "'" +permit.getRegistration()+"'"
//                    + ",industry = " + "'" +permit.getIndustry()+"'"
//                    + ",type = " + "'" +permit.getType()+"'"
//                    + ",politicaloutlook = " + "'" +user.getPoliticaloutlook()+"'"
//                    + ",healstats = " + "'" +user.getHealstats()+"'"
//                    + ",height = " + "'" +user.getHeight()+"'"
//                    + ",address = " + "'" +user.getAddress()+"'"
//                    + ",registered = " + "'" +user.getRegistered()+"'"
//                    + ",rtime = " + "'" +rtime+"'"
//                    + ",securitynumber = " + "'" +user.getSecuritynumber()+"'"
//                    + ",hold = " + "'" +user.getHold()+"'"
//                    + ",jurisdiction = " + "'" +user.getJurisdiction()+"'"
//                    + " " +"where id = " + "'" + user.getId() + "'";
//            FtpUtil.sqlFileUpload(s1);
        } else {
            permit.setStorage("0");
            permit.setPermitime(new Date());
@@ -243,11 +215,5 @@
    @ApiOperation(value = "删除", notes = "传入ids")
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(permitService.removeByIds(Func.toLongList(ids)));
    }
    public static void main(String[] args) {
        String id = "1";
        String s = "delete from    sys_permit where id=" + id + ";";
        System.out.println(s);
    }
}
src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -142,6 +142,7 @@
    private String contacts;
    private String contactscell;
    private String approve;
    private String jurisdiction;
}
src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -29,6 +29,7 @@
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="approve" property="approve"/>
        <result column="jurisdiction" property="jurisdiction"/>
    </resultMap>
src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -39,7 +39,7 @@
import java.util.Map;
/**
 *  控制器
 * 控制器
 *
 * @author BladeX
 * @since 2021-07-12
@@ -94,27 +94,29 @@
    public R save(@Valid @RequestBody Record record) {
        String cardid = record.getCardid();
        Map map = recordService.selectIn(cardid);
        if (map!=null){
        if (map != null) {
            String id = map.get("id").toString();
            recordService.removeByIds(Func.toLongList(id));
        }
        record.setStorage("1");
        record.setType("2");
        record.setPermitime(new Date());
        recordService.save(record);
        String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getEstablishtime());
        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,creditCode,enterpriseName,representative,establishTime," +
            "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
            "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime)" +
            "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction)" +
            "values(" + "'" + record.getId() + "'" + "," + "'" + record.getCreditcode() + "'" + "," + "'" + record.getEnterprisename() + "'" + "," + "'"
            + record.getRepresentative() + "'" + "," +
            "'" + formatStr + "'" + "," + "'" + record.getRegisteredcapital() + "'" + "," + "'"
            + record.getOrganizationcode() + "'" + "," + "'" + record.getRegistrationnumber() + "'" + "," +
            "'" + record.getIdentificationnumber() + "'" + "," + "'" + record.getEnterprises() + "'" + "," + "'" +
            record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" +
            record.getRegion() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry()+ "'" + "," + "'"+ record.getType() + "'" + "," +"'" + record.getPermitime() + "'" + "," + "'" + record.getDeptid() + "'" + "," + "'" + record.getPtype() + "'" + "," +
            "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'"+"," +
            "'" + record.getPerid() + "'"+"," + "'" + record.getOffices() + "'"+"," + "'" + offtime + "'"+")" ;
            record.getRegion() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getDeptid() + "'" + "," + "'" + record.getPtype() + "'" + "," +
            "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," +
            "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + offtime + "'" + "'" + "," + "'" + record.getJurisdiction() + "'" + ")";
        FtpUtil.sqlFileUpload(s);
        return R.success("成功");
    }
@@ -128,12 +130,11 @@
    public R rocordsave(@Valid @RequestBody Record record) {
        String cardid = record.getCardid();
        Map map = recordService.selectIn(cardid);
        if (map!=null){
        if (map != null) {
            record.setStorage("0");
            record.setPermitime(new Date());
            recordService.updateById(record);
        }
        else {
        } else {
            record.setStorage("0");
            record.setType("2");
            record.setPtype("2");
src/main/java/org/springblade/modules/record/entity/Record.java
@@ -161,6 +161,7 @@
    private String contacts;
    private String contactscell;
    private String storage;
    private String jurisdiction;
}
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -32,6 +32,7 @@
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="storage" property="storage"/>
        <result column="jurisdiction" property="jurisdiction"/>
    </resultMap>
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -107,7 +107,7 @@
        String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(revoke.getPermitime());
        String s = "insert into sys_revoke(id,creditCode,enterpriseName,representative,establishTime," +
            "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
            "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,reason)" +
            "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,reason,jurisdiction)" +
            "values(" + "'" + revoke.getId() + "'" + "," + "'" + revoke.getCreditcode() + "'" + "," + "'" + revoke.getEnterprisename() + "'" + "," + "'"
            + revoke.getRepresentative() + "'" + "," +
            "'" + formatStr + "'" + "," + "'" + revoke.getRegisteredcapital() + "'" + "," + "'"
@@ -118,7 +118,7 @@
            + revoke.getType() + "'" + "," +
            "'" + pertime + "'" + "," + "'" + revoke.getDeptid() + "'" + "," + "'" + revoke.getPtype() + "'" + "," +
            "'" + revoke.getRepresentativecell() + "'" + "," + "'" + revoke.getContacts() + "'" + "," + "'" + revoke.getContactscell() + "'"+"," +
            "'" + revoke.getReason() + "'"+")" ;
            "'" + revoke.getReason() + "'"+"," + "'" + revoke.getJurisdiction() + "'"+")" ;
        FtpUtil.sqlFileUpload(s);
        return R.success("成功");
    }
src/main/java/org/springblade/modules/revoke/entity/Revoke.java
@@ -146,5 +146,6 @@
    private String contactscell;
    private String storage;
    private String approve;
    private String jurisdiction;
}
src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -31,6 +31,7 @@
        <result column="contactscell" property="contactscell"/>
        <result column="storage" property="storage"/>
        <result column="approve" property="approve"/>
        <result column="jurisdiction" property="jurisdiction"/>
    </resultMap>