1.社保

tangzy

2021-09-16 4289137c3e7990f8a91b5437915a2b804c00aeb3

1.社保

 src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java

@@ -609,6 +609,7 @@
        String fileExtension = org.springblade.core.tool.utils.FileUtil.getFileExtension(fileName);
        Attach attach = new Attach();
        attach.setDomain(bladeFile.getDomain());
        attach.setTenantId("000000");
        attach.setLink(bladeFile.getLink());
        attach.setName(bladeFile.getName());
        attach.setOriginalName(bladeFile.getOriginalName());
@@ -622,12 +623,12 @@
        }
        attachService.save(attach);
        String[] split = bladeFile.getName().split("/");
        String ip = FtpConstant.ip+"/zhba/picture/";
        String ip = FtpConstant.ip+"/zhba/upload/picture/";
        String imgurl = ip + split[2];
        FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/", split[2], in);
        //数据同步
        String s1 =
            "insert into blade_attach(id,tenant_id,link,domain,name,original_name,extension,attach_size,create_user,create_dept," +
            "insert into blade_attach(id,tenant_id,link,domain,name,original_name,extension,attach_size,create_user,deptid," +
                "create_time,update_user,update_time,status,is_deleted,type,cardid";
        if (noticeId != null) {
            s1 += ",notice_id";
@@ -642,7 +643,7 @@
                "'" + attach.getExtension() + "'" + "," +
                "'" + attach.getAttachSize() + "'" + "," +
                "'" + attach.getCreateUser() + "'" + "," +
                "'" + attach.getCreateDept() + "'" + "," +
                "'" + attach.getDeptid() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
                "'" + attach.getUpdateUser() + "'" + "," +
                "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +

 src/main/java/org/springblade/modules/social/entity/Social.java

@@ -105,6 +105,7 @@
    */
        @ApiModelProperty(value = "单位id")
        private String deptid;
    private String jurisdiction;

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

 src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.social.mapper.SocialMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="socialResultMap" type="org.springblade.modules.social.entity.Social">
    <resultMap id="socialResultMap" type="org.springblade.modules.social.vo.SocialVO">
        <id column="id" property="id"/>
        <result column="namb" property="namb"/>
        <result column="sex" property="sex"/>
@@ -17,11 +17,26 @@
        <result column="amount" property="amount"/>
        <result column="insuredtime" property="insuredtime"/>
        <result column="deptid" property="deptid"/>
        <result column="jurisdiction" property="jurisdiction"/>
    </resultMap>


    <select id="selectSocialPage" resultMap="socialResultMap">
        select * from sys_social
        SELECT
        s.*,
        u.real_name as realname
        FROM
        sys_socil s
        LEFT JOIN blade_user u ON s.namb = u.id where 1=1
        <if test="social.namb!=null and social.namb!=''">
            and s.namb=#{social.namb}
        </if>
        <if test="social.deptid!=null and social.deptid!=''">
            and s.deptid=#{social.deptid}
        </if>
        <if test="social.jurisdiction!=null and social.jurisdiction!=''">
            and s.jurisdiction=#{social.jurisdiction}
        </if>
    </select>

    <update id="upSoil">

 src/main/java/org/springblade/modules/social/vo/SocialVO.java

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

    private String realname;
}