提交

src/main/java/cn/timer/api/bean/sbgjj/SbgjjAssoCbfa.java

@@ -70,5 +70,8 @@ public class SbgjjAssoCbfa extends Model<SbgjjAssoCbfa> {
 	@ApiModelProperty(value="公积金获取最大值",example="公积金获取最大值")
 	private Double gjjmax;
 	
+	@ApiModelProperty(value="公积金(0：不办理；1：办理)",example="1")
+	private Integer isGjjbl;
+    
 
 }
\ No newline at end of file

src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java

@@ -187,8 +187,10 @@ public class SocialSecurityFundController {
 		SbgjjAssoCbfa cbfa = SbgjjAssoCbfa.builder().build();
 		cbfa.setCbmcName(insura.getName());//参保名称
 		cbfa.setCbcs(insura.getInsuredcities());//参保城市
+		
 		cbfa.setSbcbfzmc(insura.getShebaoname());//社保参保方案名称
 		cbfa.setGjjcbfamc(insura.getGongjijinname());//公积金参保方案名称
+		
 		cbfa.setFwf(Double.valueOf(insura.getFwf()));//服务费 (元/人/月)
 		cbfa.setSbSbgjjid(insura.getShebaoid());//社保(公积金)方案库id
 		cbfa.setGjjSbgjjid(insura.getGongjijinid());//(社保)公积金方案库id
@@ -200,6 +202,13 @@ public class SocialSecurityFundController {
 		cbfa.setGjjmax(Double.valueOf(insura.getGjjmax()));
 		
 		cbfa.setQyid(userBean.getOrgCode());
+		if(insura.getIsGjjbl()) {
+			cbfa.setIsGjjbl(0);
+		}else {
+			cbfa.setIsGjjbl(1);
+		}
+		
+		
 		sbgjjassocbfamapper.sbgjjassocbfainsert(cbfa);
 		int cbfaid = cbfa.getId();
 		
@@ -368,6 +377,12 @@ public class SocialSecurityFundController {
 		cbfa.setSbmax(Double.valueOf(insura.getSbmax()));
 		cbfa.setGjjmax(Double.valueOf(insura.getGjjmax()));
 		
+		if(insura.getIsGjjbl()) {
+			cbfa.setIsGjjbl(0);
+		}else {
+			cbfa.setIsGjjbl(1);
+		}
+		
 		cbfa.updateById();
 		
 		sbgjjassocbfzmxmapper.deleteBycbfaid(insura.getId());

src/main/java/cn/timer/api/dto/sbgjj/InsuranceSchemeDto.java

@@ -24,6 +24,8 @@ public class InsuranceSchemeDto implements Serializable {
 	SocialfundDto[] gongjijin;
 	int gongjijinid;
 	
+	Boolean isGjjbl;//0：不办理；1：办理
+	
 	String sbmin;
 	String gjjmin;
 	

src/main/resources/mapping/sbgjj/SbgjjAssoCbfaMapper.xml

@@ -17,39 +17,10 @@
                 <result column="gjjmin" property="gjjmin" />
                 <result column="sbmax" property="sbmax" />
                 <result column="gjjmax" property="gjjmax" />
+                <result column="is_gjjbl" property="isGjjbl" />
     </resultMap>
 
-    <sql id="Base_Column_List">
-                id,
-                cbmc_name,
-                cbcs,
-                sbcbfzmc,
-                gjjcbfamc,
-                fwf,
-                sb_sbgjjid,
-                gjj_sbgjjid,
-                qyid,
-                sbmin,
-                gjjmin,
-                sbmax,
-                gjjmax
-    </sql>
 
-    <sql id="Base_Column_List_Alias">
-                id SbgjjAssoCbfa_id,
-                cbmc_name SbgjjAssoCbfa_cbmc_name,
-                cbcs SbgjjAssoCbfa_cbcs,
-                sbcbfzmc SbgjjAssoCbfa_sbcbfzmc,
-                gjjcbfamc SbgjjAssoCbfa_gjjcbfamc,
-                fwf SbgjjAssoCbfa_fwf,
-                sb_sbgjjid SbgjjAssoCbfa_sb_sbgjjid,
-                gjj_sbgjjid SbgjjAssoCbfa_gjj_sbgjjid,
-                qyid SbgjjAssoCbfa_qyid,
-                sbmin SbgjjAssoCbfa_sbmin,
-                gjjmin SbgjjAssoCbfa_gjjmin,
-                sbmax SbgjjAssoCbfa_sbmax,
-                gjjmax SbgjjAssoCbfa_gjjmax
-    </sql>
 
 
     <insert id="sbgjjassocbfainsert" parameterType="cn.timer.api.bean.sbgjj.SbgjjAssoCbfa" useGeneratedKeys="true" keyProperty="id">
@@ -89,7 +60,10 @@
                         sbmax,
                         </if>
                         <if test ='null != gjjmax'>
-                        gjjmax
+                        gjjmax,
+                        </if>
+                        <if test ='null != isGjjbl'>
+                        is_gjjbl
                         </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -127,52 +101,14 @@
                         #{sbmax},
                         </if>
                         <if test ='null != gjjmax'>
-                        #{gjjmax}
+                        #{gjjmax},
+                        </if>
+                        <if test ='null != isGjjbl'>
+                        #{isGjjbl}
                         </if>
         </trim>
     </insert>
 
-    <!-- <delete id="delete" >
-        DELETE FROM sbgjj_asso_cbfa
-        WHERE id = #{id}
-    </delete>
-
-    <update id="update" parameterType="cn.timer.api.bean.sbgjj.SbgjjAssoCbfa">
-        UPDATE sbgjj_asso_cbfa
-        <set>
-                    <if test ='null != cbmcName'>cbmc_name = #{cbmcName},</if>
-                    <if test ='null != cbcs'>cbcs = #{cbcs},</if>
-                    <if test ='null != sbcbfzmc'>sbcbfzmc = #{sbcbfzmc},</if>
-                    <if test ='null != gjjcbfamc'>gjjcbfamc = #{gjjcbfamc},</if>
-                    <if test ='null != fwf'>fwf = #{fwf},</if>
-                    <if test ='null != sbSbgjjid'>sb_sbgjjid = #{sbSbgjjid},</if>
-                    <if test ='null != gjjSbgjjid'>gjj_sbgjjid = #{gjjSbgjjid},</if>
-                    <if test ='null != qyid'>qyid = #{qyid},</if>
-                    <if test ='null != sbmin'>sbmin = #{sbmin},</if>
-                    <if test ='null != gjjmin'>gjjmin = #{gjjmin},</if>
-                    <if test ='null != sbmax'>sbmax = #{sbmax},</if>
-                    <if test ='null != gjjmax'>gjjmax = #{gjjmax}</if>
-        </set>
-        WHERE id = #{id}
-    </update>
-
-
-    <select id="load" resultMap="BaseResultMap">
-        SELECT <include refid="Base_Column_List" />
-        FROM sbgjj_asso_cbfa
-        WHERE id = #{id}
-    </select>
-
-    <select id="pageList" resultMap="BaseResultMap">
-        SELECT <include refid="Base_Column_List" />
-        FROM sbgjj_asso_cbfa
-        LIMIT #{offset}, #{pageSize}
-    </select>
    
-    <select id="pageListCount" resultType="java.lang.Integer">
-        SELECT count(1)
-        FROM sbgjj_asso_cbfa
-    </select>
- -->
 
 </mapper>
\ No newline at end of file