Pārlūkot izejas kodu

优化发布广告bug

java110 3 gadi atpakaļ
vecāks
revīzija
a111822f6a

+ 74 - 77
java110-db/src/main/resources/mapper/common/AttendanceClassesAttrV1ServiceDaoImplMapper.xml

@@ -5,102 +5,99 @@
 <mapper namespace="attendanceClassesAttrV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存考勤属性信息 add by wuxw 2018-07-03 -->
     <insert id="saveAttendanceClassesAttrInfo" parameterType="Map">
         insert into attendance_classes_attr(
-classes_id,attr_id,spec_cd,store_id,value
-) values (
-#{classesId},#{attrId},#{specCd},#{storeId},#{value}
-)
+        classes_id,attr_id,spec_cd,store_id,value
+        ) values (
+        #{classesId},#{attrId},#{specCd},#{storeId},#{value}
+        )
     </insert>
 
 
-
     <!-- 查询考勤属性信息 add by wuxw 2018-07-03 -->
     <select id="getAttendanceClassesAttrInfo" parameterType="Map" resultType="Map">
-        select  t.classes_id,t.classes_id classesId,t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd specCd,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.value 
-from attendance_classes_attr t 
-where 1 =1 
-<if test="classesId !=null and classesId != ''">
-   and t.classes_id= #{classesId}
-</if> 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.classes_id,t.classes_id classesId,t.attr_id,t.attr_id attrId,t.spec_cd,t.spec_cd
+        specCd,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.value
+        from attendance_classes_attr t
+        where 1 =1
+        <if test="classesId !=null and classesId != ''">
+            and t.classes_id= #{classesId}
+        </if>
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改考勤属性信息 add by wuxw 2018-07-03 -->
     <update id="updateAttendanceClassesAttrInfo" parameterType="Map">
-        update  attendance_classes_attr t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="classesId !=null and classesId != ''">
-, t.classes_id= #{classesId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-, t.spec_cd= #{specCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="value !=null and value != ''">
-, t.value= #{value}
-</if> 
- where 1=1 <if test="attrId !=null and attrId != ''">
-and t.attr_id= #{attrId}
-</if> 
+        update attendance_classes_attr t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+
+        <if test="specCd !=null and specCd != ''">
+            , t.spec_cd= #{specCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="value !=null and value != ''">
+            , t.value= #{value}
+        </if>
+        where 1=1
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="classesId !=null and classesId != ''">
+            and t.classes_id= #{classesId}
+        </if>
 
     </update>
 
     <!-- 查询考勤属性数量 add by wuxw 2018-07-03 -->
-     <select id="queryAttendanceClassesAttrsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from attendance_classes_attr t 
-where 1 =1 
-<if test="classesId !=null and classesId != ''">
-   and t.classes_id= #{classesId}
-</if> 
-<if test="attrId !=null and attrId != ''">
-   and t.attr_id= #{attrId}
-</if> 
-<if test="specCd !=null and specCd != ''">
-   and t.spec_cd= #{specCd}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="value !=null and value != ''">
-   and t.value= #{value}
-</if> 
+    <select id="queryAttendanceClassesAttrsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from attendance_classes_attr t
+        where 1 =1
+        <if test="classesId !=null and classesId != ''">
+            and t.classes_id= #{classesId}
+        </if>
+        <if test="attrId !=null and attrId != ''">
+            and t.attr_id= #{attrId}
+        </if>
+        <if test="specCd !=null and specCd != ''">
+            and t.spec_cd= #{specCd}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="value !=null and value != ''">
+            and t.value= #{value}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

+ 3 - 1
service-common/src/main/java/com/java110/common/smo/impl/AttendanceClassesInnerServiceSMOImpl.java

@@ -72,7 +72,9 @@ public class AttendanceClassesInnerServiceSMOImpl extends BaseServiceSMO impleme
         for (AttendanceClassesDto attendanceClassesDto : attendanceClassess) {
             tmpAttendanceClassesAttrDto = new ArrayList<>();
             for (AttendanceClassesAttrDto attendanceClassesAttrDto1 : attendanceClassesAttrDtos) {
-                tmpAttendanceClassesAttrDto.add(attendanceClassesAttrDto1);
+                if(attendanceClassesDto.getClassesId().equals(attendanceClassesAttrDto1.getClassesId())) {
+                    tmpAttendanceClassesAttrDto.add(attendanceClassesAttrDto1);
+                }
             }
             attendanceClassesDto.setAttrs(tmpAttendanceClassesAttrDto);
         }