1.许可

tangzy

2021-11-11 b4a935cfc677ba06127e836592cbea2d315d2240

1.许可

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

@@ -38,6 +38,7 @@
import org.json.JSONObject;
import org.springblade.common.cache.DictCache;
import org.springblade.common.cache.ParamCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
@@ -47,6 +48,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.OutJson;
@@ -232,8 +234,10 @@
            information.setIndustry(permit.getIndustry());
            information.setRepresentativecell(permit.getRepresentativecell());
            information.setContacts(permit.getContacts());
            information.setJurisdiction(permit.getJurisdiction());
            information.setContactscell(permit.getContactscell());
            Dept dept = new Dept();
            boolean b = permitService.updateById(permit);
            //本市公司
            if (permit.getPtype().equals("0")) {
                Long i = 1413470343230877697L;
@@ -262,14 +266,123 @@
                information.setDepartmentid(id);
            }
            informationService.save(information);
            Integer isDeleted = 0;
            //注册用户
            User user = new User();
            user.setDeptId(information.getDepartmentid());
            user.setTenantId("000000");
            user.setAccount(permit.getEnterprisename());
            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
            user.setPassword(initPassword);
            userService.saveOrUpdate(user);
            //把附件添加单位id
            attachService.updat(information.getDepartmentid(), permit.getCardid());
            user.setPassword(DigestUtil.encrypt(initPassword));
            //user.setPassword(initPassword);
            user.setCreateTime(new Date());
            user.setUpdateTime(new Date());
            user.setRoleId("1414575196264300546");
            user.setStatus(1);
            user.setIsDeleted(0);
            userService.save(user);
            String roleid = "1415563428727328770";
            String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
                ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
                " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
                "contacts,contactscell,create_user_id) " +
                "values(" + "'" + information.getId() + "'" +
                "," + "'" + information.getCreditcode() + "'" +
                "," + "'" + information.getEnterprisename() + "'" +
                "," + "'" + information.getRepresentative() + "'" +
                "," + "'" + information.getRegisteredcapital() + "'" +
                "," + "'" + information.getOrganizationcode() + "'" +
                "," + "'" + information.getRegistrationnumber() + "'" +
                "," + "'" + information.getEnterprises() + "'" +
                "," + "'" + information.getAddress() + "'" +
                "," + "'" + information.getBusiness() + "'" +
                "," + "'" + information.getRegion() + "'" +
                "," + "'" + information.getRegistration() + "'" +
                "," + "'" + information.getIndustry() + "'" +
                "," + "'" + information.getDepartmentid() + "'" +
                "," + "'" + information.getStats() + "'" +
                "," + "'" + information.getJurisdiction() + "'" +
                "," + "'" + information.getRepresentativecell() + "'" +
                "," + "'" + information.getContacts() + "'" +
                "," + "'" + information.getContactscell() + "'" +
                "," + "'" + information.getCreateUserId() + "'" + ")";
            FtpUtil.sqlFileUpload(s);
            String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + dept.getParentId() + "'" + ","
                + "'" + dept.getTenantId() + "'" +
                "," + "'" + information.getEnterprisename() + "'" +
                "," + "'" + dept.getAncestors() + "'" +
                "," + "'" + dept.getDeptCategory() + "'" +
                "," + "'" + isDeleted + "'" + ")";
            FtpUtil.sqlFileUpload(ss);
            String rtime;
            String paperTime;
            if (user.getRtime() == null) {
                rtime = null;
            } else {
                rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
            }
            //发证日期处理
            if (user.getPaperTime() == null) {
                paperTime = "";
            } else {
                paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
            }
            //头像
            if (null != user.getAvatar() && !user.getAvatar().equals("")) {
                user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
            }

            //指纹
            if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
                user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
            }

            String sss = "insert into blade_user(" +
                "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
                "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
                "politicaloutlook,healstats,height,address,registered,rtime," +
                "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
                "values(" + "'" + user.getId() + "'" +
                "," + "'" + user.getTenantId() + "'" +
                "," + "'" + user.getAccount() + "'" +
                "," + "'" + user.getPassword() + "'" +
                "," + "'" + user.getName() + "'" +
                "," + "'" + user.getRealName() + "'" +
                "," + "'" + user.getAvatar() + "'" +
                "," + "'" + user.getEmail() + "'" +
                "," + "'" + user.getPhone() + "'" +
                "," + "'" + null + "'" +
                "," + "'" + roleid + "'" +
                "," + "'" + user.getDeptId() + "'" +
                "," + "'" + user.getCardid() + "'" +
                "," + "'" + user.getNativeplace() + "'" +
                "," + "'" + user.getNation() + "'" +
                "," + "'" + user.getFingerprint() + "'" +
                "," + "'" + user.getEducation() + "'" +
                "," + "'" + user.getPoliticaloutlook() + "'" +
                "," + "'" + user.getHealstats() + "'" +
                "," + "'" + user.getHeight() + "'" +
                "," + "'" + user.getAddress() + "'" +
                "," + "'" + user.getRegistered() + "'" +
                "," + "'" + rtime + "'" +
                "," + "'" + user.getSecuritynumber() + "'" +
                "," + "'" + user.getHold() + "'" +
                "," + "'" + user.getJurisdiction() + "'" +
                "," + "'" + user.getExaminationType() + "'" +
                "," + "'" + user.getStatus() + "'" +
                "," + "'" + user.getIsDeleted() + "'" +
                "," + "'" + user.getDispatch() + "'" + ")";
            FtpUtil.sqlFileUpload(sss);
////            //注册用户
////            User user = new User();
////            user.setAccount(permit.getEnterprisename());
////            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
////            user.setPassword(initPassword);
////            user.setRoleId("1414575196264300546");
////            user.setDeptId(information.getDepartmentid());
////            userService.saveOrUpdate(user);
//            //把附件添加单位id
//            attachService.updat(information.getDepartmentid(), permit.getCardid());
            String s1 = "update sys_permit set type = " + "'" + 0 + "'" + ",approve = " + "'" + permit.getApprove() + "'" +
                " " + "where id = " + "'" + permit.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
@@ -278,7 +391,7 @@
                " " + "where id = " + "'" + permit.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        }
        return R.status(permitService.updateById(permit));
        return R.success("成功");
    }

    /**

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

@@ -232,12 +232,70 @@
                information.setDepartmentid(id);
            }
            informationService.save(information);
            Integer isDeleted = 0;
            //注册用户
            User user = new User();
            user.setDeptId(information.getDepartmentid());
            user.setTenantId("000000");
            user.setAccount(record.getEnterprisename());
            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
            user.setPassword(initPassword);
            boolean b = userService.saveOrUpdate(user);
            user.setCreateTime(new Date());
            user.setUpdateTime(new Date());
            user.setRoleId("1414575196264300546");
            user.setStatus(1);
            user.setIsDeleted(0);
            userService.save(user);
            String roleid = "1415563428727328770";
            String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
                ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
                " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
                "contacts,contactscell,create_time,create_user_id) " +
                "values(" + "'" + information.getId() + "'" +
                "," + "'" + information.getCreditcode() + "'" +
                "," + "'" + information.getEnterprisename() + "'" +
                "," + "'" + information.getRepresentative() + "'" +
                "," + "'" + information.getRegisteredcapital() + "'" +
                "," + "'" + information.getOrganizationcode() + "'" +
                "," + "'" + information.getRegistrationnumber() + "'" +
                "," + "'" + information.getEnterprises() + "'" +
                "," + "'" + information.getAddress() + "'" +
                "," + "'" + information.getBusiness() + "'" +
                "," + "'" + information.getRegion() + "'" +
                "," + "'" + information.getRegistration() + "'" +
                "," + "'" + information.getIndustry() + "'" +
                "," + "'" + information.getDepartmentid() + "'" +
                "," + "'" + information.getStats() + "'" +
                "," + "'" + information.getJurisdiction() + "'" +
                "," + "'" + information.getRepresentativecell() + "'" +
                "," + "'" + information.getContacts() + "'" +
                "," + "'" + information.getContactscell() + "'" +
                "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getCreateTime()) + "'" +
                "," + "'" + information.getCreateUserId() + "'" + ");" +
                "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + information.getDepartmentid() + "'" + "," + "'" + dept.getParentId() + "'" + ","
                + "'" + dept.getTenantId() + "'" +
                "," + "'" + information.getEnterprisename() + "'" +
                "," + "'" + dept.getAncestors() + "'" +
                "," + "'" + dept.getDeptCategory() + "'" +
                "," + "'" + isDeleted + "'" + ");" +
                "insert into blade_user(id,tenant_id,account,password,role_id,dept_id,create_time,update_time,status,is_deleted) " +
                "values(" + "'" + user.getId() + "'" +
                "," + "'" + user.getTenantId() + "'"
                + "," + "'" + user.getAccount() + "'" +
                "," + "'" + user.getPassword() + "'" +
                "," + "'" + roleid + "'" +
                "," + "'" + user.getDeptId() + "'" +
                "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
                "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
                "," + "'" + user.getStatus() + "'" +
                "," + "'" + user.getIsDeleted() + "'" + ")";
            FtpUtil.sqlFileUpload(s);
//            //注册用户
//            User user = new User();
//            user.setAccount(record.getEnterprisename());
//            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
//            user.setPassword(initPassword);
//            boolean b = userService.saveOrUpdate(user);
            //把附件添加单位id
            attachService.updat(information.getDepartmentid(), record.getCardid());
            String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
@@ -247,6 +305,9 @@
                ",popinion = " + "'" + record.getPopinion() + "'" +
                ",sopinion = " + "'" + record.getSopinion() + "'" +
                ",xopinion = " + "'" + record.getXopinion() + "'" +
                ",ptime = " + "'" + record.getPtime() + "'" +
                ",stime = " + "'" + record.getStime() + "'" +
                ",xtime = " + "'" + record.getXtime() + "'" +
                " " + "where id = " + "'" + record.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        } else {
@@ -257,6 +318,9 @@
                ",popinion = " + "'" + record.getPopinion() + "'" +
                ",sopinion = " + "'" + record.getSopinion() + "'" +
                ",xopinion = " + "'" + record.getXopinion() + "'" +
                ",ptime = " + "'" + record.getPtime() + "'" +
                ",stime = " + "'" + record.getStime() + "'" +
                ",xtime = " + "'" + record.getXtime() + "'" +
                " " + "where id = " + "'" + record.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        }

 src/main/java/org/springblade/modules/record/entity/Record.java

@@ -179,4 +179,20 @@
    private Date overtime;


    @ApiModelProperty(value = "派出所审批时间")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date ptime;

    @ApiModelProperty(value = "县审批时间")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date stime;

    @ApiModelProperty(value = "市审批时间")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date xtime;


}

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

@@ -39,6 +39,9 @@
        <result column="xopinion" property="xopinion"/>
        <result column="sopinion" property="sopinion"/>
        <result column="overtime" property="overtime"/>
        <result column="ptime" property="ptime"/>
        <result column="stime" property="stime"/>
        <result column="xtime" property="xtime"/>
    </resultMap>