tangzy
2021-08-28 0278b7437773e85fad74fe3a609e6c22de344d01
1.统计
6 files modified
104 ■■■■■ changed files
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml 6 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/permit/controller/PermitController.java 86 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/resource/service/IAttachService.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -157,7 +157,7 @@
        WHERE u.examination_type = 1
        GROUP BY u.dept_id,u.jurisdiction
        ) B ON A.dept_id = B.dept_id
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
            WHERE A.jurisdiction = #{jurisdiction}
        </if>
        <if test="deptid!=null and deptid==''">
@@ -180,7 +180,7 @@
        WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
        AND hold = 2
        GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
            WHERE A.jurisdiction = #{jurisdiction}
        </if>
        <if test="deptid!=null and deptid==''">
@@ -210,7 +210,7 @@
        WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
        AND dispatch = 0
        GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201">
        <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
            WHERE A.jurisdiction = #{jurisdiction}
        </if>
        <if test="deptid!=null and deptid==''">
src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -36,18 +36,30 @@
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.json.JSONObject;
import org.springblade.common.cache.DictCache;
import org.springblade.common.cache.ParamCache;
import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
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.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.OutJson;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import sun.net.www.http.HttpClient;
@@ -61,6 +73,9 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
/**
 * 控制器
@@ -89,6 +104,10 @@
    private static String fileName = "sql.json";
    private final IPermitService permitService;
    private final IDeptService iDeptService;
    private final IInformationService informationService;
    private final IUserService userService;
    private final IAttachService attachService;
    /**
     * 详情
@@ -197,6 +216,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);
        }
        return R.status(permitService.updateById(permit));
    }
src/main/java/org/springblade/modules/resource/mapper/AttachMapper.java
@@ -37,5 +37,5 @@
     * @return
     */
    List<AttachVO> selectAttachPage(IPage page, AttachVO attach,String type,String cardid);
    void updat(String deptid,String cardid);
}
src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml
@@ -30,4 +30,7 @@
        </if>
    </select>
    <update id="updat">
        update blade_attach set deptid=#{deptid} where cardid=#{cardid}
    </update>
</mapper>
src/main/java/org/springblade/modules/resource/service/IAttachService.java
@@ -36,5 +36,5 @@
     * @return
     */
    IPage<AttachVO> selectAttachPage(IPage<AttachVO> page, AttachVO attach,String type,String cardid);
    void updat(String deptid,String cardid);
}
src/main/java/org/springblade/modules/resource/service/impl/AttachServiceImpl.java
@@ -37,4 +37,9 @@
        return page.setRecords(baseMapper.selectAttachPage(page, attach,type,cardid));
    }
    @Override
    public void updat(String deptid, String cardid) {
        baseMapper.updat(deptid, cardid);
    }
}