1.许可

tangzy

2021-11-25 a97da78dd37c4e11f46650ff71a9706affd9955f

1.许可

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

@@ -125,73 +125,73 @@
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入permit")
    public R update(@Valid @RequestBody Permit permit) {
        //审核通过
        if (permit.getType().equals("0")) {
            //新增组织机构和单位信息
            Information information =new Information();
            information.setCreditcode(permit.getCreditcode());
            information.setEnterprisename(permit.getEnterprisename());
            information.setRepresentative(permit.getRepresentative());
            information.setEstablishtime(permit.getEstablishtime());
            information.setRegisteredcapital(permit.getRegisteredcapital());
            information.setOrganizationcode(permit.getOrganizationcode());
            information.setRegistrationnumber(permit.getRegistrationnumber());
            information.setEnterprises(permit.getEnterprises());
            information.setAddress(permit.getAddress());
            information.setBusiness(permit.getBusiness());
            information.setRegion(permit.getRegion());
            information.setRegistration(permit.getRegistration());
            information.setIndustry(permit.getIndustry());
            information.setRepresentativecell(permit.getRepresentativecell());
            information.setContacts(permit.getContacts());
            information.setContactscell(permit.getContactscell());
            Dept dept = new Dept();
            //本市公司
            if (permit.getPtype().equals("0")){
                Long i = 1413470343230877697L;
                dept.setParentId(i);
                dept.setAncestors("0,1413470343230877697");
            }
            //培训公司
            else if (permit.getPtype().equals("1")){
                Long i = 1418458374477549569L;
                dept.setParentId(i);
                dept.setAncestors("0,1418458374477549569");
            }
            else{
                Long i = 1420222961377357825L;
                dept.setParentId(i);
                dept.setAncestors("0,1420222961377357825");
            }
            dept.setTenantId("000000");
            dept.setDeptName(information.getEnterprisename());
            dept.setDeptCategory(1);
            if (iDeptService.submit(dept)) {
                CacheUtil.clear(SYS_CACHE);
                // 返回懒加载树更新节点所需字段
                Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
                    .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
                String id = kv.get("id").toString();
                information.setDepartmentid(id);
            }
            informationService.save(information);
            //注册用户
            User user = new User();
            user.setAccount(permit.getEnterprisename());
            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
            user.setPassword(initPassword);
            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);
        }
        else {
            String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + permit.getApprove() + "'"+
                " " +"where id = " + "'" + permit.getId() + "'";
            FtpUtil.sqlFileUpload(s1);
        }
//        //审核通过
//        if (permit.getType().equals("0")) {
//            //新增组织机构和单位信息
//            Information information =new Information();
//            information.setCreditcode(permit.getCreditcode());
//            information.setEnterprisename(permit.getEnterprisename());
//            information.setRepresentative(permit.getRepresentative());
//            information.setEstablishtime(permit.getEstablishtime());
//            information.setRegisteredcapital(permit.getRegisteredcapital());
//            information.setOrganizationcode(permit.getOrganizationcode());
//            information.setRegistrationnumber(permit.getRegistrationnumber());
//            information.setEnterprises(permit.getEnterprises());
//            information.setAddress(permit.getAddress());
//            information.setBusiness(permit.getBusiness());
//            information.setRegion(permit.getRegion());
//            information.setRegistration(permit.getRegistration());
//            information.setIndustry(permit.getIndustry());
//            information.setRepresentativecell(permit.getRepresentativecell());
//            information.setContacts(permit.getContacts());
//            information.setContactscell(permit.getContactscell());
//            Dept dept = new Dept();
//            //本市公司
//            if (permit.getPtype().equals("0")){
//                Long i = 1413470343230877697L;
//                dept.setParentId(i);
//                dept.setAncestors("0,1413470343230877697");
//            }
//            //培训公司
//            else if (permit.getPtype().equals("1")){
//                Long i = 1418458374477549569L;
//                dept.setParentId(i);
//                dept.setAncestors("0,1418458374477549569");
//            }
//            else{
//                Long i = 1420222961377357825L;
//                dept.setParentId(i);
//                dept.setAncestors("0,1420222961377357825");
//            }
//            dept.setTenantId("000000");
//            dept.setDeptName(information.getEnterprisename());
//            dept.setDeptCategory(1);
//            if (iDeptService.submit(dept)) {
//                CacheUtil.clear(SYS_CACHE);
//                // 返回懒加载树更新节点所需字段
//                Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
//                    .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
//                String id = kv.get("id").toString();
//                information.setDepartmentid(id);
//            }
//            informationService.save(information);
//            //注册用户
//            User user = new User();
//            user.setAccount(permit.getEnterprisename());
//            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
//            user.setPassword(initPassword);
//            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);
//        }
//        else {
//            String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + permit.getApprove() + "'"+
//                " " +"where id = " + "'" + permit.getId() + "'";
//            FtpUtil.sqlFileUpload(s1);
//        }
        return R.status(permitService.updateById(permit));
    }


 src/main/java/org/springblade/modules/permit/entity/Permit.java

@@ -160,4 +160,20 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    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/permit/mapper/PermitMapper.xml

@@ -37,11 +37,39 @@
        <result column="xopinion" property="xopinion"/>
        <result column="sopinion" property="sopinion"/>
        <result column="overtime" property="overtime"/>
        <result column="papprove" property="papprove"/>
        <result column="xapprove" property="xapprove"/>
        <result column="sapprove" property="sapprove"/>
        <result column="popinion" property="popinion"/>
        <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>


    <select id="selectPermitPage" resultMap="permitResultMap">
        select * from sys_permit
        select si.* from sys_permit si left join
        sys_jurisdiction sj
        on
        sj.id = si.jurisdiction where 1=1
        <if test="permit.ptype!=null and permit.ptype!=''">
            and  si.ptype=#{permit.ptype}
        </if>
        <if test="permit.jurisdiction!=null and permit.jurisdiction != '' and permit.jurisdiction!='1372091709474910209'">
            and (sj.id = #{permit.jurisdiction} or sj.parent_id = #{permit.jurisdiction})
        </if>
        <if test="permit.papprove!=null and permit.papprove!=''">
            and papprove=#{permit.papprove}
        </if>
        <if test="permit.xapprove!=null and permit.xapprove!=''">
            and xapprove=#{permit.xapprove}
        </if>
        <if test="permit.sapprove!=null and permit.sapprove!=''">
            and sapprove=#{permit.sapprove}
        </if>
    </select>

</mapper>

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

@@ -145,6 +145,11 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date officetime;

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

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private String deptid;

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

@@ -41,6 +41,7 @@
        <result column="ptime" property="ptime"/>
        <result column="stime" property="stime"/>
        <result column="xtime" property="xtime"/>
        <result column="permitime" property="permitime"/>
    </resultMap>



 src/main/java/org/springblade/modules/recordk/entity/Recordk.java

@@ -151,27 +151,27 @@
    private String contacts;
    private String contactscell;
    private String approve;
    //派出所审批
    private String papprove;
    //县审批
    private String xapprove;
    //市审批
    private String sapprove;
    //派出意见
    private String popinion;
    //县意见
    private String xopinion;
    //市意见
    private String sopinion;

    @ApiModelProperty(value = "审批时间")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date overtime;

    @ApiModelProperty(value = "提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date permitime;
//    //派出所审批
//    private String papprove;
//    //县审批
//    private String xapprove;
//    //市审批
//    private String sapprove;
//    //派出意见
//    private String popinion;
//    //县意见
//    private String xopinion;
//    //市意见
//    private String sopinion;
//
//    @ApiModelProperty(value = "审批时间")
//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
//    @DateTimeFormat(pattern = "yyyy-MM-dd")
//    private Date overtime;
//
//    @ApiModelProperty(value = "提交时间")
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private Date permitime;

}

 src/main/java/org/springblade/modules/recordk/mapper/RecordkMapper.xml

@@ -28,13 +28,6 @@
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="approve" property="approve"/>
        <result column="papprove" property="papprove"/>
        <result column="xapprove" property="xapprove"/>
        <result column="sapprove" property="sapprove"/>
        <result column="popinion" property="popinion"/>
        <result column="xopinion" property="xopinion"/>
        <result column="sopinion" property="sopinion"/>
        <result column="overtime" property="overtime"/>
    </resultMap>