Merge branch 'master' of http://39.98.153.250:9080/bowintek/GHSCPartyBuild

src/main/java/com/ghsc/partybuild/service/impl/partyLife/MeetingServiceImpl.java

@@ -41,7 +41,7 @@ public class MeetingServiceImpl implements MeetingService {
     @Override
     public PageInfo<PartyLifeMeetingVo> getList(int pageIndex, int pageSize, Integer partyLifeMeetingType, String id, String dzzdm, String title, Date startDate, Date endDate){
         PageHelper.startPage(pageIndex, pageSize);
-        List<PartyLifeMeetingVo> list = partyLifeMeetingCQuery.selectMeetingList(partyLifeMeetingType, null, dzzdm, title, startDate, endDate);
+        List<PartyLifeMeetingVo> list = partyLifeMeetingCQuery.selectMeetingList(partyLifeMeetingType, id, dzzdm, title, startDate, endDate);
 
         list.forEach(item -> {
             //'“三重一大”制度'

src/main/resources/mapping/PartyLifeMeetingCQuery.xml

@@ -12,6 +12,9 @@
         left join (select partyLifeMeetingId,count(0) as attendance from pf_partylifemeeting_personnel where isAbsenteeism = 0 group by partyLifeMeetingId) p1 on pfm.partyLifeMeetingId = p1.partyLifeMeetingId
         left join (select partyLifeMeetingId,count(0) as absentCount from pf_partylifemeeting_personnel where isAbsenteeism = 1 group by partyLifeMeetingId) p2 on pfm.partyLifeMeetingId = p2.partyLifeMeetingId
         where 1=1
+        <if test="id != null and id != ''">
+            and pfm.partyLifeMeetingId = #{id}
+        </if>
         <if test="dzzdm != null and dzzdm != ''">
             and pfm.partyCode like concat('%',#{dzzdm},'%')
         </if>
@@ -43,7 +46,7 @@
     <select id="selectMeetingPersonnelList" resultType="com.ghsc.partybuild.vo.PartyLifeMeetingPersonnelVo">
         select pp.id, pp.partyLifeMeetingId, pp.rybm, pp.isAbsenteeism, pp.absenteeismCause,
                pp.createTime, pp.createUserId, pp.updateTime, pp.updateUserId, u.XM, u.RYJBXXBS,
-               case when pp.isAbsenteeism=1 then '缺勤' else '出勤' end as isAbsenteeismName
+               case when pp.isAbsenteeism=1 then '是' else '否' end as isAbsenteeismName
         from pf_partylifemeeting_personnel pp
         left join VM_RYJBXX u on pp.rybm = u.rybm
         where pp.partyLifeMeetingId = #{partyLifeMeetingId}

src/main/resources/static/app/main/partylife/meeting/edit.html

@@ -103,7 +103,7 @@
                                                    class="filled-in chk-col-red" ng-checked="it.isabsenteeism==1"
                                                    ng-click="it.isabsenteeism==1?it.isabsenteeism=0:it.isabsenteeism=1"/>
                                             <label class="checkbox_lable" style="height: 10px;"
-                                                   for="{{pageId}}_checkbox_{{$index+1}}"></label>
+                                                   for="{{pageId}}_checkbox_{{$index+1}}">{{it.isabsenteeism == 1 ? "是" : "否"}}</label>
                                         </td>
                                         <td>
                                             <textarea name="absenteeismcause" ng-model="it.absenteeismcause"

src/main/resources/static/app/main/partylife/scyd/edit.html

@@ -114,7 +114,7 @@
                                                    class="filled-in chk-col-red" ng-checked="it.isabsenteeism==1"
                                                    ng-click="it.isabsenteeism==1?it.isabsenteeism=0:it.isabsenteeism=1"/>
                                             <label class="checkbox_lable" style="height: 10px;"
-                                                   for="{{pageId}}_checkbox_{{$index+1}}"></label>
+                                            for="{{pageId}}_checkbox_{{$index+1}}">{{it.isabsenteeism == 1 ? "是" : "否"}}</label>
                                         </td>
                                         <td>
                                             <textarea name="absenteeismcause" ng-model="it.absenteeismcause"