Commit 2193f034 by 吴迪

Merge remote-tracking branch 'origin/master'

parents f07327e8 30a24a3a
...@@ -49,8 +49,8 @@ public interface TycpdmFirmDao extends BaseMapper<TycpdmFirmEntity> { ...@@ -49,8 +49,8 @@ public interface TycpdmFirmDao extends BaseMapper<TycpdmFirmEntity> {
@Select("select count(1) from tycpdm_firm where firmName=#{firmname} and logout_flag=1") @Select("select count(1) from tycpdm_firm where firmName=#{firmname} and logout_flag=1")
int selectByIdFirmNameSC(@Param("firmname") String firmname); int selectByIdFirmNameSC(@Param("firmname") String firmname);
@Select("select count(1) from tycpdm_firm where certificateCode=#{certificateCode} and logout_flag=1") @Select("select count(1) from tycpdm_firm where certificateCode=#{certificateCode} and logout_flag=1 and f_id<>#{fId}")
int selectByIdCertificateCode(@Param("certificateCode") String certificateCode); int selectByIdCertificateCode(@Param("certificateCode") String certificateCode,@Param("fId") String fId);
@Select("select count(1) from firm where firm_name=#{firmname} and (logout_flag=2 or logout_flag=0)") @Select("select count(1) from firm where firm_name=#{firmname} and (logout_flag=2 or logout_flag=0)")
int selectByIdFirmNameXTSC(@Param("firmname")String firmname); int selectByIdFirmNameXTSC(@Param("firmname")String firmname);
......
...@@ -14,7 +14,7 @@ import java.util.*; ...@@ -14,7 +14,7 @@ import java.util.*;
@Data @Data
public class NewsParams extends PageParams { public class NewsParams extends PageParams {
private String title; private String title;
private int levels; private String levels;
private String author; private String author;
private String editor; private String editor;
private String keyword; private String keyword;
......
...@@ -323,7 +323,8 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm ...@@ -323,7 +323,8 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
if (!AlgorithmUtils.checkUSCC(certificateCode.toString())){ if (!AlgorithmUtils.checkUSCC(certificateCode.toString())){
throw new RRException("统一社会信用代码输入错误"); throw new RRException("统一社会信用代码输入错误");
} }
if(tycpdmFirmDao.selectByIdCertificateCode(String.valueOf(certificateCode))>0){
if(tycpdmFirmDao.selectByIdCertificateCode(String.valueOf(certificateCode),String.valueOf(body.get("fid")))>0){
throw new RRException("统一社会信用代码已存在"); throw new RRException("统一社会信用代码已存在");
} }
//写入死值 //写入死值
......
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
t.lasteditor_index, t.lasteditor_index,
t.check_index_author, t.check_index_author,
t.checkflag_index, t.checkflag_index,
t.levels t.levels,
t.directpath
FROM FROM
index_carousel_manage t index_carousel_manage t
where 1=1 where 1=1
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
and starttime_index BETWEEN #{indexCarouselManage.startTime} AND #{indexCarouselManage.endTime} and starttime_index BETWEEN #{indexCarouselManage.startTime} AND #{indexCarouselManage.endTime}
</if> </if>
<choose> <choose>
<when test="indexCarouselManage.levels !=null and indexCarouselManage.levels !=''"> <when test="indexCarouselManage.levels !=null">
AND t.levels = #{indexCarouselManage.levels} AND t.levels = #{indexCarouselManage.levels}
</when> </when>
<otherwise> <otherwise>
......
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
t.classid, t.classid,
t.levels, t.levels,
t.releasedate, t.releasedate,
t.updatedate t.updatedate,
t.directpath
FROM FROM
news t news t
WHERE WHERE
...@@ -94,7 +95,7 @@ ...@@ -94,7 +95,7 @@
a.classid in(429,430,428,435) a.classid in(429,430,428,435)
) )
<choose> <choose>
<when test="newsParams.levels == 0"> <when test="newsParams.levels !=null">
AND levels = #{newsParams.levels} AND levels = #{newsParams.levels}
</when> </when>
<otherwise> <otherwise>
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
t.lasteditor, t.lasteditor,
t.auditor, t.auditor,
t.Status, t.Status,
t.PicLevel t.PicLevel,
t.jumppath
FROM FROM
picture t picture t
where 1=1 where 1=1
...@@ -58,11 +59,11 @@ ...@@ -58,11 +59,11 @@
and inputDate BETWEEN #{params.inputDateStart} AND #{params.inputDateEnd} and inputDate BETWEEN #{params.inputDateStart} AND #{params.inputDateEnd}
</if> </if>
<choose> <choose>
<when test="params.pictureLevel !=null and params.pictureLevel !=''"> <when test="params.pictureLevel !=null ">
AND PicLevel = #{params.pictureLevel} AND PicLevel = #{params.pictureLevel}
</when> </when>
<otherwise> <otherwise>
AND PicLevel = 0 AND PicLevel > 0
</otherwise> </otherwise>
</choose> </choose>
ORDER BY ORDER BY
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<result property="auditor" column="auditor"/> <result property="auditor" column="auditor"/>
</resultMap> </resultMap>
<select id="selectPolicyList" resultMap="policyMap" parameterType="io.office.modules.manage.entity.dto.PolicyParams"> <select id="selectPolicyList" resultMap="policyMap" parameterType="io.office.modules.manage.entity.dto.PolicyParams">
select id,class,title,editor,lasteditor,releasedate,updatedate,auditor,status,levels from Policy select id,class,title,editor,lasteditor,releasedate,updatedate,auditor,status,levels,directpath from Policy
where 1=1 where 1=1
<if test="newsParams.updateTimeStart !=null and newsParams.updateTimeEnd !=null"> <if test="newsParams.updateTimeStart !=null and newsParams.updateTimeEnd !=null">
and updatedate BETWEEN #{newsParams.updateTimeStart} AND #{newsParams.updateTimeEnd} and updatedate BETWEEN #{newsParams.updateTimeStart} AND #{newsParams.updateTimeEnd}
......
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
b.status, b.status,
b.levels, b.levels,
b.releasedate, b.releasedate,
b.updatedate b.updatedate,
b.directpath
FROM FROM
(select classid,newsid FROM TopIcNews group BY classid,newsid) AS a (select classid,newsid FROM TopIcNews group BY classid,newsid) AS a
LEFT JOIN news AS b ON a.newsid = b.id LEFT JOIN news AS b ON a.newsid = b.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment