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

lib/数据更新脚本.txt

@@ -0,0 +1,36 @@
+--2024.6.26 党政联席会、民主集中制
+
+-- 会议表新增主持人、列会人员、会议主要议程及结果字段
+alter table pf_partylifemeeting add compere varchar(36) NULL COMMENT '主持人';
+alter table pf_partylifemeeting add personnel varchar(500) NULL COMMENT '列会人员';
+alter table pf_partylifemeeting add result varchar(1000) NULL COMMENT '会议主要议程及结果';
+
+CREATE TABLE `pf_partylifemeeting_personnel`  (
+  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `partyLifeMeetingId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '会议id',
+  `rybm` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '人员编码',
+  `isAbsenteeism` int NULL DEFAULT NULL COMMENT '是否缺勤 0-缺勤；1-出勤',
+  `absenteeismCause` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '缺勤原因',
+  `createTime` datetime NULL DEFAULT NULL,
+  `createUserId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `updateTime` datetime NULL DEFAULT NULL,
+  `updateUserId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+-- 字典
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-829d-7085c2a00001', 4, '党政联席会', 'PartyLifeMeetingType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('23f5e615-b16a-11ec-829d-7085c2a00002', 5, '民主集中制', 'PartyLifeMeetingType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
+
+-- 菜单
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('4806821b-b18e-11ec-829d-7085c2a9999e', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'c4516fca-2dd8-4373-9be8-1df510c8e5e1', NULL, 18, 'home.pf_meetingList4', '党政联席会', NULL, NULL, NULL, 1, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900001', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a9999e', NULL, 1, 'home.pf_meetingEdit4', '编辑党政联席会', NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900002', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a9999e', NULL, 2, 'home.pf_meetingAdd4', '新增党政联席会', NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900003', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a9999e', NULL, 3, 'home.pf_meetingDetail4', '查看党政联席会详情', NULL, NULL, NULL, 0, 0, NULL);
+
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('4806821b-b18e-11ec-829d-7085c2a99990', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'c4516fca-2dd8-4373-9be8-1df510c8e5e1', NULL, 1, 'home.pf_meetingList5', '民主集中制', NULL, NULL, NULL, 1, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900011', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99990', NULL, 1, 'home.pf_meetingEdit5', '编辑民主集中制', NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900022', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99990', NULL, 2, 'home.pf_meetingAdd5', '新增民主集中制', NULL, NULL, NULL, 0, 0, NULL);
+INSERT INTO `cf_menu` (`MENUID`, `APPLICATIONID`, `PARENTMENUID`, `MNUSYSTEM`, `MENUORDER`, `MENUNO`, `MENUNAME`, `MENUPROGRAM`, `MENUPIC`, `MENUDESC`, `ISVISIBLE`, `ISLEAF`, `ISBLANK`) VALUES ('873f7565-0dd8-4a1c-877a-06f6e2900033', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', '4806821b-b18e-11ec-829d-7085c2a99990', NULL, 3, 'home.pf_meetingDetail5', '查看民主集中制详情', NULL, NULL, NULL, 0, 0, NULL);

parth5/parth5/src/app/views/login/login.page.html

@@ -1,7 +1,7 @@
 <ion-content>
   <div class="lg-top">
-    <span style="color: #fff;float:left;text-align: center;width: 100%;font-size: 20px;margin-top: 50px;">中共河北化工医药职业技术学院委员会</span>
-    <span style="color: #fff;float:left;text-align: center;width: 100%;font-size: 22px;margin-top: 18px;">党费缴纳平台</span>
+    <span style="color: #fff;float:left;text-align: center;width: 100%;font-size: 20px;margin-top: 50px;">广州卫生职业技术学院</span>
+    <span style="color: #fff;float:left;text-align: center;width: 100%;font-size: 22px;margin-top: 18px;">智慧党建系统</span>
   </div>
   <ion-item class="lg-title" style="margin-top: -12px;border-radius: 7px;" >
     <ion-label>用户登录</ion-label>
@@ -19,9 +19,9 @@
                 (click)="Login()" style="width: 80%;font-size: 20px;font-weight: bold;--border-radius: 18px;height: 40px;--background:#E80000" >登    录
     </ion-button>
 
-    <ion-button *ngIf="isDev" fill="solid"
+    <!--<ion-button *ngIf="isDev" fill="solid"
                 (click)="clearStorage()" style="width: 80%;font-size: 20px;font-weight: bold;--border-radius: 18px;height: 40px;--background:#E80000" >清除缓存
-    </ion-button>
+    </ion-button>-->
   </div>
   <ion-item *ngIf="errorShow">
     <ion-label>{{msg}}</ion-label>

src/main/java/com/ghsc/partybuild/controller/partyLife/MeetingController.java

@@ -45,16 +45,25 @@ public class MeetingController {
         return result;
     }
 
+    @ResponseBody
+    @GetMapping("/getUserAddressList")
+    public RequsetData<List<String>> getUserAddressList(String userId) {
+        RequsetData<List<String>> res = new RequsetData<>();
+        res.setItem(meetingService.getUserAddressList(userId));
+        return res;
+    }
+
     @ResponseBody
     @GetMapping("/get")
     public RequsetData<PartyLifeMeetingVo> get(@RequestParam(required = false) String id) {
         RequsetData<PartyLifeMeetingVo> res = new RequsetData<>();
 
         PartyLifeMeetingVo model = meetingService.getMeetingById(id);
-        if (model == null || (model != null && stringUtils.IsNullOrEmpty(model.getPartyLifeMeetingId()))) {
+        if (model == null) {
             UUID uuid = UUID.randomUUID();
             model = new PartyLifeMeetingVo();
-            model.setPartyLifeMeetingId(uuid.toString());
+            model.setPartylifemeetingid(uuid.toString());
+            model.setPersonnellist(new ArrayList<>());
         }
 
         res.setItem(model);
@@ -63,13 +72,13 @@ public class MeetingController {
 
     @ResponseBody
     @PostMapping("/save")
-    public RequsetData<String> save(@RequestBody PfPartylifemeeting data) {
+    public RequsetData<String> save(@RequestBody PartyLifeMeetingVo data) {
         RequsetData<String> result = new RequsetData<String>();
         int count = 0;
         String message = "";
 
         try {
-            count = meetingService.save(data, userService.getLoginUser().getUserid(), userService.getUserInfobyId(userService.getLoginUser().getUserid()).getName());
+            count = meetingService.save(data, userService.getLoginUser().getUserid());
         } catch (Exception e) {
             e.printStackTrace();
             message = e.toString();
@@ -127,11 +136,14 @@ public class MeetingController {
         //列名
         data.setName(excelTitle);
         List<String> titles = new ArrayList();
+        titles.add("序号");
         titles.add("所属党组织");
         titles.add("会议主题");
         titles.add("会议时间");
-        titles.add("会议参加人数");
         titles.add("会议地点");
+        titles.add("主持人");
+        titles.add("出席人员数量");
+        titles.add("缺勤人员数量");
         titles.add("创建人");
         titles.add("创建时间");
 
@@ -139,15 +151,19 @@ public class MeetingController {
 
         //数据
         List<List<Object>> rows = new ArrayList();
+        int i = 0;
         for (PartyLifeMeetingVo item : dataList) {
             List<Object> row = new ArrayList();
-            row.add(item.getPartyName());
+            row.add(++i);
+            row.add(item.getPartyname());
             row.add(item.getTitle());
-            row.add(dateUtils.dateToStrFormat(item.getMeetingDate(), "yyyy-MM-dd"));
-            row.add(item.getUserCount());
+            row.add(dateUtils.dateToStrFormat(item.getMeetingdate(), "yyyy-MM-dd"));
             row.add(item.getAddress());
-            row.add(item.getCreateUserName());
-            row.add(dateUtils.dateToStrFormat(item.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+            row.add(item.getCompere());
+            row.add(item.getAttendance());
+            row.add(item.getAbsentcount());
+            row.add(item.getCreateusername());
+            row.add(dateUtils.dateToStrFormat(item.getCreatetime(), "yyyy-MM-dd HH:mm:ss"));
             rows.add(row);
         }
         data.setRows(rows);

src/main/java/com/ghsc/partybuild/mapper/PartyLifeMeetingCQuery.java

@@ -1,5 +1,6 @@
 package com.ghsc.partybuild.mapper;
 
+import com.ghsc.partybuild.vo.PartyLifeMeetingPersonnelVo;
 import com.ghsc.partybuild.vo.PartyLifeMeetingVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -8,4 +9,8 @@ import java.util.List;
 
 public interface PartyLifeMeetingCQuery {
     List<PartyLifeMeetingVo> selectMeetingList(@Param("partyLifeMeetingType") Integer partyLifeMeetingType, @Param("id") String id, @Param("dzzdm") String dzzdm, @Param("title") String title, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    List<String> selectAddressList(String userId);
+
+    List<PartyLifeMeetingPersonnelVo> selectMeetingPersonnelList(String partyLifeMeetingId);
 }

src/main/java/com/ghsc/partybuild/mapper/PfPartylifemeetingMapper.java

@@ -10,7 +10,7 @@ public interface PfPartylifemeetingMapper {
 
     int deleteByExample(PfPartylifemeetingExample example);
 
-    int deleteByPrimaryKey(String partyLifeMeetingId);
+    int deleteByPrimaryKey(String partylifemeetingid);
 
     int insert(PfPartylifemeeting record);
 
@@ -18,7 +18,7 @@ public interface PfPartylifemeetingMapper {
 
     List<PfPartylifemeeting> selectByExample(PfPartylifemeetingExample example);
 
-    PfPartylifemeeting selectByPrimaryKey(String partyLifeMeetingId);
+    PfPartylifemeeting selectByPrimaryKey(String partylifemeetingid);
 
     int updateByExampleSelective(@Param("record") PfPartylifemeeting record, @Param("example") PfPartylifemeetingExample example);
 

src/main/java/com/ghsc/partybuild/mapper/PfPartylifemeetingPersonnelMapper.java

@@ -0,0 +1,30 @@
+package com.ghsc.partybuild.mapper;
+
+import com.ghsc.partybuild.model.PfPartylifemeetingPersonnel;
+import com.ghsc.partybuild.model.PfPartylifemeetingPersonnelExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PfPartylifemeetingPersonnelMapper {
+    long countByExample(PfPartylifemeetingPersonnelExample example);
+
+    int deleteByExample(PfPartylifemeetingPersonnelExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(PfPartylifemeetingPersonnel record);
+
+    int insertSelective(PfPartylifemeetingPersonnel record);
+
+    List<PfPartylifemeetingPersonnel> selectByExample(PfPartylifemeetingPersonnelExample example);
+
+    PfPartylifemeetingPersonnel selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") PfPartylifemeetingPersonnel record, @Param("example") PfPartylifemeetingPersonnelExample example);
+
+    int updateByExample(@Param("record") PfPartylifemeetingPersonnel record, @Param("example") PfPartylifemeetingPersonnelExample example);
+
+    int updateByPrimaryKeySelective(PfPartylifemeetingPersonnel record);
+
+    int updateByPrimaryKey(PfPartylifemeetingPersonnel record);
+}

src/main/java/com/ghsc/partybuild/model/PfPartylifemeeting.java

@@ -3,34 +3,40 @@ package com.ghsc.partybuild.model;
 import java.util.Date;
 
 public class PfPartylifemeeting {
-    private String partyLifeMeetingId;
+    private String partylifemeetingid;
 
     private String title;
 
-    private String partyCode;
+    private String partycode;
 
-    private Integer partyLifeMeetingType;
+    private Integer partylifemeetingtype;
 
-    private Date meetingDate;
+    private Date meetingdate;
 
-    private Integer userCount;
+    private Integer usercount;
 
     private String address;
 
-    private Date createTime;
+    private Date createtime;
 
-    private String createUserId;
+    private String createuserid;
 
-    private Date updateTime;
+    private Date updatetime;
 
-    private String updateUserId;
+    private String updateuserid;
 
-    public String getPartyLifeMeetingId() {
-        return partyLifeMeetingId;
+    private String personnel;
+
+    private String result;
+
+    private String compere;
+
+    public String getPartylifemeetingid() {
+        return partylifemeetingid;
     }
 
-    public void setPartyLifeMeetingId(String partyLifeMeetingId) {
-        this.partyLifeMeetingId = partyLifeMeetingId == null ? null : partyLifeMeetingId.trim();
+    public void setPartylifemeetingid(String partylifemeetingid) {
+        this.partylifemeetingid = partylifemeetingid == null ? null : partylifemeetingid.trim();
     }
 
     public String getTitle() {
@@ -41,36 +47,36 @@ public class PfPartylifemeeting {
         this.title = title == null ? null : title.trim();
     }
 
-    public String getPartyCode() {
-        return partyCode;
+    public String getPartycode() {
+        return partycode;
     }
 
-    public void setPartyCode(String partyCode) {
-        this.partyCode = partyCode == null ? null : partyCode.trim();
+    public void setPartycode(String partycode) {
+        this.partycode = partycode == null ? null : partycode.trim();
     }
 
-    public Integer getPartyLifeMeetingType() {
-        return partyLifeMeetingType;
+    public Integer getPartylifemeetingtype() {
+        return partylifemeetingtype;
     }
 
-    public void setPartyLifeMeetingType(Integer partyLifeMeetingType) {
-        this.partyLifeMeetingType = partyLifeMeetingType;
+    public void setPartylifemeetingtype(Integer partylifemeetingtype) {
+        this.partylifemeetingtype = partylifemeetingtype;
     }
 
-    public Date getMeetingDate() {
-        return meetingDate;
+    public Date getMeetingdate() {
+        return meetingdate;
     }
 
-    public void setMeetingDate(Date meetingDate) {
-        this.meetingDate = meetingDate;
+    public void setMeetingdate(Date meetingdate) {
+        this.meetingdate = meetingdate;
     }
 
-    public Integer getUserCount() {
-        return userCount;
+    public Integer getUsercount() {
+        return usercount;
     }
 
-    public void setUserCount(Integer userCount) {
-        this.userCount = userCount;
+    public void setUsercount(Integer usercount) {
+        this.usercount = usercount;
     }
 
     public String getAddress() {
@@ -81,35 +87,59 @@ public class PfPartylifemeeting {
         this.address = address == null ? null : address.trim();
     }
 
-    public Date getCreateTime() {
-        return createTime;
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+
+    public String getCreateuserid() {
+        return createuserid;
+    }
+
+    public void setCreateuserid(String createuserid) {
+        this.createuserid = createuserid == null ? null : createuserid.trim();
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    public String getUpdateuserid() {
+        return updateuserid;
     }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public void setUpdateuserid(String updateuserid) {
+        this.updateuserid = updateuserid == null ? null : updateuserid.trim();
     }
 
-    public String getCreateUserId() {
-        return createUserId;
+    public String getPersonnel() {
+        return personnel;
     }
 
-    public void setCreateUserId(String createUserId) {
-        this.createUserId = createUserId == null ? null : createUserId.trim();
+    public void setPersonnel(String personnel) {
+        this.personnel = personnel == null ? null : personnel.trim();
     }
 
-    public Date getUpdateTime() {
-        return updateTime;
+    public String getResult() {
+        return result;
     }
 
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
+    public void setResult(String result) {
+        this.result = result == null ? null : result.trim();
     }
 
-    public String getUpdateUserId() {
-        return updateUserId;
+    public String getCompere() {
+        return compere;
     }
 
-    public void setUpdateUserId(String updateUserId) {
-        this.updateUserId = updateUserId == null ? null : updateUserId.trim();
+    public void setCompere(String compere) {
+        this.compere = compere == null ? null : compere.trim();
     }
 }

src/main/java/com/ghsc/partybuild/model/PfPartylifemeetingPersonnel.java

@@ -0,0 +1,95 @@
+package com.ghsc.partybuild.model;
+
+import java.util.Date;
+
+public class PfPartylifemeetingPersonnel {
+    private String id;
+
+    private String partylifemeetingid;
+
+    private String rybm;
+
+    private Integer isabsenteeism;
+
+    private String absenteeismcause;
+
+    private Date createtime;
+
+    private String createuserid;
+
+    private Date updatetime;
+
+    private String updateuserid;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getPartylifemeetingid() {
+        return partylifemeetingid;
+    }
+
+    public void setPartylifemeetingid(String partylifemeetingid) {
+        this.partylifemeetingid = partylifemeetingid == null ? null : partylifemeetingid.trim();
+    }
+
+    public String getRybm() {
+        return rybm;
+    }
+
+    public void setRybm(String rybm) {
+        this.rybm = rybm == null ? null : rybm.trim();
+    }
+
+    public Integer getIsabsenteeism() {
+        return isabsenteeism;
+    }
+
+    public void setIsabsenteeism(Integer isabsenteeism) {
+        this.isabsenteeism = isabsenteeism;
+    }
+
+    public String getAbsenteeismcause() {
+        return absenteeismcause;
+    }
+
+    public void setAbsenteeismcause(String absenteeismcause) {
+        this.absenteeismcause = absenteeismcause == null ? null : absenteeismcause.trim();
+    }
+
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+
+    public String getCreateuserid() {
+        return createuserid;
+    }
+
+    public void setCreateuserid(String createuserid) {
+        this.createuserid = createuserid == null ? null : createuserid.trim();
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    public String getUpdateuserid() {
+        return updateuserid;
+    }
+
+    public void setUpdateuserid(String updateuserid) {
+        this.updateuserid = updateuserid == null ? null : updateuserid.trim();
+    }
+}

src/main/java/com/ghsc/partybuild/model/PfPartylifemeetingPersonnelExample.java

@@ -0,0 +1,801 @@
+package com.ghsc.partybuild.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PfPartylifemeetingPersonnelExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PfPartylifemeetingPersonnelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidIsNull() {
+            addCriterion("partyLifeMeetingId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidIsNotNull() {
+            addCriterion("partyLifeMeetingId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidEqualTo(String value) {
+            addCriterion("partyLifeMeetingId =", value, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidNotEqualTo(String value) {
+            addCriterion("partyLifeMeetingId <>", value, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidGreaterThan(String value) {
+            addCriterion("partyLifeMeetingId >", value, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidGreaterThanOrEqualTo(String value) {
+            addCriterion("partyLifeMeetingId >=", value, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidLessThan(String value) {
+            addCriterion("partyLifeMeetingId <", value, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidLessThanOrEqualTo(String value) {
+            addCriterion("partyLifeMeetingId <=", value, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidLike(String value) {
+            addCriterion("partyLifeMeetingId like", value, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidNotLike(String value) {
+            addCriterion("partyLifeMeetingId not like", value, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidIn(List<String> values) {
+            addCriterion("partyLifeMeetingId in", values, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidNotIn(List<String> values) {
+            addCriterion("partyLifeMeetingId not in", values, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidBetween(String value1, String value2) {
+            addCriterion("partyLifeMeetingId between", value1, value2, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartylifemeetingidNotBetween(String value1, String value2) {
+            addCriterion("partyLifeMeetingId not between", value1, value2, "partylifemeetingid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmIsNull() {
+            addCriterion("rybm is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmIsNotNull() {
+            addCriterion("rybm is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmEqualTo(String value) {
+            addCriterion("rybm =", value, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmNotEqualTo(String value) {
+            addCriterion("rybm <>", value, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmGreaterThan(String value) {
+            addCriterion("rybm >", value, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmGreaterThanOrEqualTo(String value) {
+            addCriterion("rybm >=", value, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmLessThan(String value) {
+            addCriterion("rybm <", value, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmLessThanOrEqualTo(String value) {
+            addCriterion("rybm <=", value, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmLike(String value) {
+            addCriterion("rybm like", value, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmNotLike(String value) {
+            addCriterion("rybm not like", value, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmIn(List<String> values) {
+            addCriterion("rybm in", values, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmNotIn(List<String> values) {
+            addCriterion("rybm not in", values, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmBetween(String value1, String value2) {
+            addCriterion("rybm between", value1, value2, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andRybmNotBetween(String value1, String value2) {
+            addCriterion("rybm not between", value1, value2, "rybm");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismIsNull() {
+            addCriterion("isAbsenteeism is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismIsNotNull() {
+            addCriterion("isAbsenteeism is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismEqualTo(Integer value) {
+            addCriterion("isAbsenteeism =", value, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismNotEqualTo(Integer value) {
+            addCriterion("isAbsenteeism <>", value, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismGreaterThan(Integer value) {
+            addCriterion("isAbsenteeism >", value, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismGreaterThanOrEqualTo(Integer value) {
+            addCriterion("isAbsenteeism >=", value, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismLessThan(Integer value) {
+            addCriterion("isAbsenteeism <", value, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismLessThanOrEqualTo(Integer value) {
+            addCriterion("isAbsenteeism <=", value, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismIn(List<Integer> values) {
+            addCriterion("isAbsenteeism in", values, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismNotIn(List<Integer> values) {
+            addCriterion("isAbsenteeism not in", values, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismBetween(Integer value1, Integer value2) {
+            addCriterion("isAbsenteeism between", value1, value2, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsabsenteeismNotBetween(Integer value1, Integer value2) {
+            addCriterion("isAbsenteeism not between", value1, value2, "isabsenteeism");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseIsNull() {
+            addCriterion("absenteeismCause is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseIsNotNull() {
+            addCriterion("absenteeismCause is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseEqualTo(String value) {
+            addCriterion("absenteeismCause =", value, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseNotEqualTo(String value) {
+            addCriterion("absenteeismCause <>", value, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseGreaterThan(String value) {
+            addCriterion("absenteeismCause >", value, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseGreaterThanOrEqualTo(String value) {
+            addCriterion("absenteeismCause >=", value, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseLessThan(String value) {
+            addCriterion("absenteeismCause <", value, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseLessThanOrEqualTo(String value) {
+            addCriterion("absenteeismCause <=", value, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseLike(String value) {
+            addCriterion("absenteeismCause like", value, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseNotLike(String value) {
+            addCriterion("absenteeismCause not like", value, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseIn(List<String> values) {
+            addCriterion("absenteeismCause in", values, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseNotIn(List<String> values) {
+            addCriterion("absenteeismCause not in", values, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseBetween(String value1, String value2) {
+            addCriterion("absenteeismCause between", value1, value2, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andAbsenteeismcauseNotBetween(String value1, String value2) {
+            addCriterion("absenteeismCause not between", value1, value2, "absenteeismcause");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNull() {
+            addCriterion("createTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIsNotNull() {
+            addCriterion("createTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeEqualTo(Date value) {
+            addCriterion("createTime =", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotEqualTo(Date value) {
+            addCriterion("createTime <>", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThan(Date value) {
+            addCriterion("createTime >", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("createTime >=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThan(Date value) {
+            addCriterion("createTime <", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("createTime <=", value, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeIn(List<Date> values) {
+            addCriterion("createTime in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotIn(List<Date> values) {
+            addCriterion("createTime not in", values, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeBetween(Date value1, Date value2) {
+            addCriterion("createTime between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("createTime not between", value1, value2, "createtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridIsNull() {
+            addCriterion("createUserId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridIsNotNull() {
+            addCriterion("createUserId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridEqualTo(String value) {
+            addCriterion("createUserId =", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridNotEqualTo(String value) {
+            addCriterion("createUserId <>", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridGreaterThan(String value) {
+            addCriterion("createUserId >", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridGreaterThanOrEqualTo(String value) {
+            addCriterion("createUserId >=", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridLessThan(String value) {
+            addCriterion("createUserId <", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridLessThanOrEqualTo(String value) {
+            addCriterion("createUserId <=", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridLike(String value) {
+            addCriterion("createUserId like", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridNotLike(String value) {
+            addCriterion("createUserId not like", value, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridIn(List<String> values) {
+            addCriterion("createUserId in", values, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridNotIn(List<String> values) {
+            addCriterion("createUserId not in", values, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridBetween(String value1, String value2) {
+            addCriterion("createUserId between", value1, value2, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateuseridNotBetween(String value1, String value2) {
+            addCriterion("createUserId not between", value1, value2, "createuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updateTime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updateTime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updateTime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updateTime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updateTime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updateTime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updateTime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updateTime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updateTime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updateTime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updateTime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updateTime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridIsNull() {
+            addCriterion("updateUserId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridIsNotNull() {
+            addCriterion("updateUserId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridEqualTo(String value) {
+            addCriterion("updateUserId =", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridNotEqualTo(String value) {
+            addCriterion("updateUserId <>", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridGreaterThan(String value) {
+            addCriterion("updateUserId >", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridGreaterThanOrEqualTo(String value) {
+            addCriterion("updateUserId >=", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridLessThan(String value) {
+            addCriterion("updateUserId <", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridLessThanOrEqualTo(String value) {
+            addCriterion("updateUserId <=", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridLike(String value) {
+            addCriterion("updateUserId like", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridNotLike(String value) {
+            addCriterion("updateUserId not like", value, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridIn(List<String> values) {
+            addCriterion("updateUserId in", values, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridNotIn(List<String> values) {
+            addCriterion("updateUserId not in", values, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridBetween(String value1, String value2) {
+            addCriterion("updateUserId between", value1, value2, "updateuserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateuseridNotBetween(String value1, String value2) {
+            addCriterion("updateUserId not between", value1, value2, "updateuserid");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -1,5 +1,8 @@
 package com.ghsc.partybuild.service.impl.partyLife;
 
+import com.ghsc.partybuild.mapper.PfPartylifemeetingPersonnelMapper;
+import com.ghsc.partybuild.model.PfPartylifemeetingPersonnel;
+import com.ghsc.partybuild.model.PfPartylifemeetingPersonnelExample;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ghsc.partybuild.mapper.PartyLifeMeetingCQuery;
@@ -17,12 +20,15 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 @Service("pfMeetingService")
 public class MeetingServiceImpl implements MeetingService {
     @Autowired
     private PfPartylifemeetingMapper pfPartylifemeetingMapper;
     @Autowired
+    private PfPartylifemeetingPersonnelMapper pfPartylifemeetingPersonnelMapper;
+    @Autowired
     private PartyLifeMeetingCQuery partyLifeMeetingCQuery;
     @Autowired
     private DictionaryService dictionaryService;
@@ -39,39 +45,87 @@ public class MeetingServiceImpl implements MeetingService {
         return result;
     }
 
+    @Override
+    public List<String> getUserAddressList(String userId){
+        return partyLifeMeetingCQuery.selectAddressList(userId);
+    }
+
     @Override
     public PartyLifeMeetingVo getMeetingById(String id) {
         if (stringUtils.IsNullOrEmpty(id))
             return null;
 
         List<PartyLifeMeetingVo> list = partyLifeMeetingCQuery.selectMeetingList(null, id, null, null, null, null);
-
-        return list.size() > 0 ? list.get(0) : null;
+        PartyLifeMeetingVo data = list.size() > 0 ? list.get(0) : null;
+        if(data != null){
+            data.setPersonnellist(partyLifeMeetingCQuery.selectMeetingPersonnelList(data.getPartylifemeetingid()));
+        }
+        return data;
     }
 
     @Override
-    public int save(PfPartylifemeeting data, String userId, String userName) {
+    public int save(PartyLifeMeetingVo data, String userId) {
         int result = 0;
-        PartyLifeMeetingVo dbModel = getMeetingById(data.getPartyLifeMeetingId());
-        if (dbModel == null || (dbModel != null && stringUtils.IsNullOrEmpty(dbModel.getPartyLifeMeetingId()))) {
-            data.setCreateTime(new Date());
-            data.setCreateUserId(userId);
+        PfPartylifemeeting dbModel = pfPartylifemeetingMapper.selectByPrimaryKey(data.getPartylifemeetingid());
+        if (dbModel == null) {
+            dbModel = new PartyLifeMeetingVo();
+            dbModel.setPartylifemeetingid(data.getPartylifemeetingid());
+            dbModel.setTitle(data.getTitle());
+            dbModel.setPartycode(data.getPartycode());
+            dbModel.setPartylifemeetingtype(data.getPartylifemeetingtype());
+            dbModel.setMeetingdate(data.getMeetingdate());
+            dbModel.setAddress(data.getAddress());
+            dbModel.setPersonnel(data.getPersonnel());
+            dbModel.setResult(data.getResult());
+            dbModel.setCompere(data.getCompere());
+            dbModel.setCreatetime(new Date());
+            dbModel.setCreateuserid(userId);
 
-            result = pfPartylifemeetingMapper.insert(data);
+            result = pfPartylifemeetingMapper.insert(dbModel);
         } else {
-            data.setUpdateTime(new Date());
-            data.setUpdateUserId(userId);
+            dbModel.setTitle(data.getTitle());
+            dbModel.setPartycode(data.getPartycode());
+            dbModel.setPartylifemeetingtype(data.getPartylifemeetingtype());
+            dbModel.setMeetingdate(data.getMeetingdate());
+            dbModel.setAddress(data.getAddress());
+            dbModel.setPersonnel(data.getPersonnel());
+            dbModel.setResult(data.getResult());
+            dbModel.setCompere(data.getCompere());
+            data.setUpdatetime(new Date());
+            data.setUpdateuserid(userId);
 
             result = pfPartylifemeetingMapper.updateByPrimaryKey(data);
         }
 
+        PfPartylifemeetingPersonnelExample perExp = new PfPartylifemeetingPersonnelExample();
+        perExp.or().andPartylifemeetingidEqualTo(data.getPartylifemeetingid());
+        pfPartylifemeetingPersonnelMapper.deleteByExample(perExp);
+        if(data.getPersonnellist().size() > 0){
+            data.getPersonnellist().forEach(item -> {
+                PfPartylifemeetingPersonnel perModel = new PfPartylifemeetingPersonnel();
+                perModel.setId(UUID.randomUUID().toString());
+                perModel.setRybm(item.getRybm());
+                perModel.setPartylifemeetingid(data.getPartylifemeetingid());
+                perModel.setIsabsenteeism(item.getIsabsenteeism());
+                perModel.setAbsenteeismcause(item.getAbsenteeismcause());
+                perModel.setCreatetime(new Date());
+                perModel.setCreateuserid(userId);
+
+                pfPartylifemeetingPersonnelMapper.insert(perModel);
+            });
+        }
+
         return result;
     }
 
     @Override
     public int delete(List<String> meetingIdList) {
         PfPartylifemeetingExample exp = new PfPartylifemeetingExample();
-        PfPartylifemeetingExample.Criteria cri = exp.or().andPartyLifeMeetingIdIn(meetingIdList);
+        exp.or().andPartylifemeetingidIn(meetingIdList);
+
+        PfPartylifemeetingPersonnelExample perExp = new PfPartylifemeetingPersonnelExample();
+        perExp.or().andPartylifemeetingidIn(meetingIdList);
+        pfPartylifemeetingPersonnelMapper.selectByExample(perExp);
 
         return pfPartylifemeetingMapper.deleteByExample(exp);
     }

src/main/java/com/ghsc/partybuild/service/partyLife/MeetingService.java

@@ -10,9 +10,11 @@ import java.util.List;
 public interface MeetingService {
     PageInfo<PartyLifeMeetingVo> getList(int pageIndex, int pageSize, int partyLifeMeetingType, String dzzdm, String title, Date startDate, Date endDate);
 
+    List<String> getUserAddressList(String userId);
+
     PartyLifeMeetingVo getMeetingById(String id);
 
-    int save(PfPartylifemeeting data, String userId, String userName);
+    int save(PartyLifeMeetingVo data, String userId);
 
     int delete(List<String> meetingIdList);
 }

src/main/java/com/ghsc/partybuild/util/ExcelHelper.java

@@ -332,7 +332,8 @@ public class ExcelHelper {
 
                 Cell cell = dataRow.createCell(colIndex);
                 if (cellData != null) {
-                    cell.setCellValue(cellData.toString());
+//                    cell.setCellValue(cellData.toString());
+                    setCellValue(cell, cellData);
                 } else {
                     cell.setCellValue("");
                 }
@@ -382,6 +383,18 @@ public class ExcelHelper {
         }
     }
 
+    public void setCellValue(Cell cell, Object value) {
+        if (value instanceof String) {
+            cell.setCellValue((String) value);
+        } else if (value instanceof Double) {
+            cell.setCellValue((Double) value);
+        } else if (value instanceof Integer) {
+            cell.setCellValue((Integer) value);
+        } else if (value instanceof Boolean) {
+            cell.setCellValue((Boolean) value);
+        } // Add more types as needed
+    }
+
     public void exportExcelToTemp(HttpServletResponse response, InputStream is, List<PageItem> pageList, String fileName, PaperSize paperSize, Boolean landscape) throws IOException {
         // 告诉浏览器用什么软件可以打开此文件
         response.setHeader("content-Type", "application/vnd.ms-excel");

src/main/java/com/ghsc/partybuild/vo/PartyLifeMeetingPersonnelVo.java

@@ -0,0 +1,11 @@
+package com.ghsc.partybuild.vo;
+
+import com.ghsc.partybuild.model.PfPartylifemeetingPersonnel;
+import lombok.Data;
+
+@Data
+public class PartyLifeMeetingPersonnelVo extends PfPartylifemeetingPersonnel {
+    private String xm;
+    private String ryjbxxbs;
+    private String isabsenteeismname;
+}

src/main/java/com/ghsc/partybuild/vo/PartyLifeMeetingVo.java

@@ -3,8 +3,13 @@ package com.ghsc.partybuild.vo;
 import com.ghsc.partybuild.model.PfPartylifemeeting;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PartyLifeMeetingVo extends PfPartylifemeeting {
-    private String partyName;
-    private String createUserName;
+    private String partyname;
+    private String createusername;
+    private Integer absentcount;//缺勤人数
+    private Integer attendance;//出席人员数量
+    public List<PartyLifeMeetingPersonnelVo> personnellist;
 }

src/main/resources/generatorConfig.xml

@@ -261,7 +261,9 @@
          <table schema="" tableName="zz_LearningPlan"><property name="useActualColumnNames" value="true"/></table>
           <table schema="" tableName="lw_leaderAssessment"><property name="useActualColumnNames" value="true"/></table>
           <table schema="" tableName="us_party_month"></table>
-        -->
+        <table schema="" tableName="pf_partylifemeeting"></table>
+        <table schema="" tableName="pf_partylifemeeting_personnel"></table>
 
+        -->
     </context>
 </generatorConfiguration>

src/main/resources/mapping/PartyLifeMeetingCQuery.xml

@@ -2,11 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ghsc.partybuild.mapper.PartyLifeMeetingCQuery">
     <select id="selectMeetingList" resultType="com.ghsc.partybuild.vo.PartyLifeMeetingVo">
-        select pfm.partyLifeMeetingId, pfm.title, pfm.partyCode, pfm.partyLifeMeetingType, pfm.meetingDate, pfm.userCount, pfm.address, pfm.createTime, pfm.createUserId, pfm.updateTime, pfm.updateUserId,
-        p.DZZMC as partyName,u.XM as createUserName
+        select pfm.partyLifeMeetingId, pfm.title, pfm.partyCode, pfm.partyLifeMeetingType, pfm.meetingDate,
+        pfm.userCount, pfm.address, pfm.createTime, pfm.createUserId, pfm.updateTime, pfm.updateUserId,
+        pfm.personnel, pfm.result, pfm.compere,
+        p.DZZMC as partyName,u.XM as createUserName, IFNULL(p1.attendance, 0) as attendance, IFNULL(p2.absentCount, 0) as absentCount
         from pf_partylifemeeting pfm
         inner join zz_zzqkxx p on pfm.partyCode = p.DZZDM
         left join VM_RYJBXX u on pfm.createUserId = u.rybm
+        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="dzzdm != null and dzzdm != ''">
             and pfm.partyCode like concat('%',#{dzzdm},'%')
@@ -28,4 +32,21 @@
         </if>
         order by pfm.createTime desc
     </select>
+    <select id="selectAddressList" resultType="java.lang.String">
+        select c.address
+        from pf_partylifemeeting c
+        where c.CREATEUSERID = #{userId}
+          and c.address is not null
+        group by c.address
+        order by max(c.CREATETIME) desc
+    </select>
+    <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
+        from pf_partylifemeeting_personnel pp
+                 left join VM_RYJBXX u on pp.rybm = u.rybm
+        where pp.partyLifeMeetingId = #{partyLifeMeetingId}
+        order by pp.createTime
+    </select>
 </mapper>

src/main/resources/mapping/PfPartylifemeetingMapper.xml

@@ -2,17 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ghsc.partybuild.mapper.PfPartylifemeetingMapper">
   <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.PfPartylifemeeting">
-    <id column="partyLifeMeetingId" jdbcType="VARCHAR" property="partyLifeMeetingId" />
+    <id column="partyLifeMeetingId" jdbcType="VARCHAR" property="partylifemeetingid" />
     <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="partyCode" jdbcType="VARCHAR" property="partyCode" />
-    <result column="partyLifeMeetingType" jdbcType="INTEGER" property="partyLifeMeetingType" />
-    <result column="meetingDate" jdbcType="DATE" property="meetingDate" />
-    <result column="userCount" jdbcType="INTEGER" property="userCount" />
+    <result column="partyCode" jdbcType="VARCHAR" property="partycode" />
+    <result column="partyLifeMeetingType" jdbcType="INTEGER" property="partylifemeetingtype" />
+    <result column="meetingDate" jdbcType="DATE" property="meetingdate" />
+    <result column="userCount" jdbcType="INTEGER" property="usercount" />
     <result column="address" jdbcType="VARCHAR" property="address" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="createUserId" jdbcType="VARCHAR" property="createUserId" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="updateUserId" jdbcType="VARCHAR" property="updateUserId" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createtime" />
+    <result column="createUserId" jdbcType="VARCHAR" property="createuserid" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updatetime" />
+    <result column="updateUserId" jdbcType="VARCHAR" property="updateuserid" />
+    <result column="personnel" jdbcType="VARCHAR" property="personnel" />
+    <result column="result" jdbcType="VARCHAR" property="result" />
+    <result column="compere" jdbcType="VARCHAR" property="compere" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -74,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     partyLifeMeetingId, title, partyCode, partyLifeMeetingType, meetingDate, userCount, 
-    address, createTime, createUserId, updateTime, updateUserId
+    address, createTime, createUserId, updateTime, updateUserId, personnel, result, compere
   </sql>
   <select id="selectByExample" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingExample" resultMap="BaseResultMap">
     select
@@ -94,11 +97,11 @@
     select 
     <include refid="Base_Column_List" />
     from pf_partylifemeeting
-    where partyLifeMeetingId = #{partyLifeMeetingId,jdbcType=VARCHAR}
+    where partyLifeMeetingId = #{partylifemeetingid,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from pf_partylifemeeting
-    where partyLifeMeetingId = #{partyLifeMeetingId,jdbcType=VARCHAR}
+    where partyLifeMeetingId = #{partylifemeetingid,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingExample">
     delete from pf_partylifemeeting
@@ -110,82 +113,102 @@
     insert into pf_partylifemeeting (partyLifeMeetingId, title, partyCode, 
       partyLifeMeetingType, meetingDate, userCount, 
       address, createTime, createUserId, 
-      updateTime, updateUserId)
-    values (#{partyLifeMeetingId,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{partyCode,jdbcType=VARCHAR}, 
-      #{partyLifeMeetingType,jdbcType=INTEGER}, #{meetingDate,jdbcType=DATE}, #{userCount,jdbcType=INTEGER}, 
-      #{address,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{updateUserId,jdbcType=VARCHAR})
+      updateTime, updateUserId, personnel, 
+      result, compere)
+    values (#{partylifemeetingid,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{partycode,jdbcType=VARCHAR}, 
+      #{partylifemeetingtype,jdbcType=INTEGER}, #{meetingdate,jdbcType=DATE}, #{usercount,jdbcType=INTEGER}, 
+      #{address,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{createuserid,jdbcType=VARCHAR}, 
+      #{updatetime,jdbcType=TIMESTAMP}, #{updateuserid,jdbcType=VARCHAR}, #{personnel,jdbcType=VARCHAR}, 
+      #{result,jdbcType=VARCHAR}, #{compere,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.PfPartylifemeeting">
     insert into pf_partylifemeeting
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="partyLifeMeetingId != null">
+      <if test="partylifemeetingid != null">
         partyLifeMeetingId,
       </if>
       <if test="title != null">
         title,
       </if>
-      <if test="partyCode != null">
+      <if test="partycode != null">
         partyCode,
       </if>
-      <if test="partyLifeMeetingType != null">
+      <if test="partylifemeetingtype != null">
         partyLifeMeetingType,
       </if>
-      <if test="meetingDate != null">
+      <if test="meetingdate != null">
         meetingDate,
       </if>
-      <if test="userCount != null">
+      <if test="usercount != null">
         userCount,
       </if>
       <if test="address != null">
         address,
       </if>
-      <if test="createTime != null">
+      <if test="createtime != null">
         createTime,
       </if>
-      <if test="createUserId != null">
+      <if test="createuserid != null">
         createUserId,
       </if>
-      <if test="updateTime != null">
+      <if test="updatetime != null">
         updateTime,
       </if>
-      <if test="updateUserId != null">
+      <if test="updateuserid != null">
         updateUserId,
       </if>
+      <if test="personnel != null">
+        personnel,
+      </if>
+      <if test="result != null">
+        result,
+      </if>
+      <if test="compere != null">
+        compere,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="partyLifeMeetingId != null">
-        #{partyLifeMeetingId,jdbcType=VARCHAR},
+      <if test="partylifemeetingid != null">
+        #{partylifemeetingid,jdbcType=VARCHAR},
       </if>
       <if test="title != null">
         #{title,jdbcType=VARCHAR},
       </if>
-      <if test="partyCode != null">
-        #{partyCode,jdbcType=VARCHAR},
+      <if test="partycode != null">
+        #{partycode,jdbcType=VARCHAR},
       </if>
-      <if test="partyLifeMeetingType != null">
-        #{partyLifeMeetingType,jdbcType=INTEGER},
+      <if test="partylifemeetingtype != null">
+        #{partylifemeetingtype,jdbcType=INTEGER},
       </if>
-      <if test="meetingDate != null">
-        #{meetingDate,jdbcType=DATE},
+      <if test="meetingdate != null">
+        #{meetingdate,jdbcType=DATE},
       </if>
-      <if test="userCount != null">
-        #{userCount,jdbcType=INTEGER},
+      <if test="usercount != null">
+        #{usercount,jdbcType=INTEGER},
       </if>
       <if test="address != null">
         #{address,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createuserid != null">
+        #{createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateuserid != null">
+        #{updateuserid,jdbcType=VARCHAR},
       </if>
-      <if test="createUserId != null">
-        #{createUserId,jdbcType=VARCHAR},
+      <if test="personnel != null">
+        #{personnel,jdbcType=VARCHAR},
       </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
+      <if test="result != null">
+        #{result,jdbcType=VARCHAR},
       </if>
-      <if test="updateUserId != null">
-        #{updateUserId,jdbcType=VARCHAR},
+      <if test="compere != null">
+        #{compere,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -198,38 +221,47 @@
   <update id="updateByExampleSelective" parameterType="map">
     update pf_partylifemeeting
     <set>
-      <if test="record.partyLifeMeetingId != null">
-        partyLifeMeetingId = #{record.partyLifeMeetingId,jdbcType=VARCHAR},
+      <if test="record.partylifemeetingid != null">
+        partyLifeMeetingId = #{record.partylifemeetingid,jdbcType=VARCHAR},
       </if>
       <if test="record.title != null">
         title = #{record.title,jdbcType=VARCHAR},
       </if>
-      <if test="record.partyCode != null">
-        partyCode = #{record.partyCode,jdbcType=VARCHAR},
+      <if test="record.partycode != null">
+        partyCode = #{record.partycode,jdbcType=VARCHAR},
       </if>
-      <if test="record.partyLifeMeetingType != null">
-        partyLifeMeetingType = #{record.partyLifeMeetingType,jdbcType=INTEGER},
+      <if test="record.partylifemeetingtype != null">
+        partyLifeMeetingType = #{record.partylifemeetingtype,jdbcType=INTEGER},
       </if>
-      <if test="record.meetingDate != null">
-        meetingDate = #{record.meetingDate,jdbcType=DATE},
+      <if test="record.meetingdate != null">
+        meetingDate = #{record.meetingdate,jdbcType=DATE},
       </if>
-      <if test="record.userCount != null">
-        userCount = #{record.userCount,jdbcType=INTEGER},
+      <if test="record.usercount != null">
+        userCount = #{record.usercount,jdbcType=INTEGER},
       </if>
       <if test="record.address != null">
         address = #{record.address,jdbcType=VARCHAR},
       </if>
-      <if test="record.createTime != null">
-        createTime = #{record.createTime,jdbcType=TIMESTAMP},
+      <if test="record.createtime != null">
+        createTime = #{record.createtime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.createUserId != null">
-        createUserId = #{record.createUserId,jdbcType=VARCHAR},
+      <if test="record.createuserid != null">
+        createUserId = #{record.createuserid,jdbcType=VARCHAR},
       </if>
-      <if test="record.updateTime != null">
-        updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
+      <if test="record.updatetime != null">
+        updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.updateUserId != null">
-        updateUserId = #{record.updateUserId,jdbcType=VARCHAR},
+      <if test="record.updateuserid != null">
+        updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.personnel != null">
+        personnel = #{record.personnel,jdbcType=VARCHAR},
+      </if>
+      <if test="record.result != null">
+        result = #{record.result,jdbcType=VARCHAR},
+      </if>
+      <if test="record.compere != null">
+        compere = #{record.compere,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -238,17 +270,20 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update pf_partylifemeeting
-    set partyLifeMeetingId = #{record.partyLifeMeetingId,jdbcType=VARCHAR},
+    set partyLifeMeetingId = #{record.partylifemeetingid,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR},
-      partyCode = #{record.partyCode,jdbcType=VARCHAR},
-      partyLifeMeetingType = #{record.partyLifeMeetingType,jdbcType=INTEGER},
-      meetingDate = #{record.meetingDate,jdbcType=DATE},
-      userCount = #{record.userCount,jdbcType=INTEGER},
+      partyCode = #{record.partycode,jdbcType=VARCHAR},
+      partyLifeMeetingType = #{record.partylifemeetingtype,jdbcType=INTEGER},
+      meetingDate = #{record.meetingdate,jdbcType=DATE},
+      userCount = #{record.usercount,jdbcType=INTEGER},
       address = #{record.address,jdbcType=VARCHAR},
-      createTime = #{record.createTime,jdbcType=TIMESTAMP},
-      createUserId = #{record.createUserId,jdbcType=VARCHAR},
-      updateTime = #{record.updateTime,jdbcType=TIMESTAMP},
-      updateUserId = #{record.updateUserId,jdbcType=VARCHAR}
+      createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
+      personnel = #{record.personnel,jdbcType=VARCHAR},
+      result = #{record.result,jdbcType=VARCHAR},
+      compere = #{record.compere,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -259,48 +294,60 @@
       <if test="title != null">
         title = #{title,jdbcType=VARCHAR},
       </if>
-      <if test="partyCode != null">
-        partyCode = #{partyCode,jdbcType=VARCHAR},
+      <if test="partycode != null">
+        partyCode = #{partycode,jdbcType=VARCHAR},
       </if>
-      <if test="partyLifeMeetingType != null">
-        partyLifeMeetingType = #{partyLifeMeetingType,jdbcType=INTEGER},
+      <if test="partylifemeetingtype != null">
+        partyLifeMeetingType = #{partylifemeetingtype,jdbcType=INTEGER},
       </if>
-      <if test="meetingDate != null">
-        meetingDate = #{meetingDate,jdbcType=DATE},
+      <if test="meetingdate != null">
+        meetingDate = #{meetingdate,jdbcType=DATE},
       </if>
-      <if test="userCount != null">
-        userCount = #{userCount,jdbcType=INTEGER},
+      <if test="usercount != null">
+        userCount = #{usercount,jdbcType=INTEGER},
       </if>
       <if test="address != null">
         address = #{address,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null">
-        createTime = #{createTime,jdbcType=TIMESTAMP},
+      <if test="createtime != null">
+        createTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createuserid != null">
+        createUserId = #{createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateuserid != null">
+        updateUserId = #{updateuserid,jdbcType=VARCHAR},
       </if>
-      <if test="createUserId != null">
-        createUserId = #{createUserId,jdbcType=VARCHAR},
+      <if test="personnel != null">
+        personnel = #{personnel,jdbcType=VARCHAR},
       </if>
-      <if test="updateTime != null">
-        updateTime = #{updateTime,jdbcType=TIMESTAMP},
+      <if test="result != null">
+        result = #{result,jdbcType=VARCHAR},
       </if>
-      <if test="updateUserId != null">
-        updateUserId = #{updateUserId,jdbcType=VARCHAR},
+      <if test="compere != null">
+        compere = #{compere,jdbcType=VARCHAR},
       </if>
     </set>
-    where partyLifeMeetingId = #{partyLifeMeetingId,jdbcType=VARCHAR}
+    where partyLifeMeetingId = #{partylifemeetingid,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.ghsc.partybuild.model.PfPartylifemeeting">
     update pf_partylifemeeting
     set title = #{title,jdbcType=VARCHAR},
-      partyCode = #{partyCode,jdbcType=VARCHAR},
-      partyLifeMeetingType = #{partyLifeMeetingType,jdbcType=INTEGER},
-      meetingDate = #{meetingDate,jdbcType=DATE},
-      userCount = #{userCount,jdbcType=INTEGER},
+      partyCode = #{partycode,jdbcType=VARCHAR},
+      partyLifeMeetingType = #{partylifemeetingtype,jdbcType=INTEGER},
+      meetingDate = #{meetingdate,jdbcType=DATE},
+      userCount = #{usercount,jdbcType=INTEGER},
       address = #{address,jdbcType=VARCHAR},
-      createTime = #{createTime,jdbcType=TIMESTAMP},
-      createUserId = #{createUserId,jdbcType=VARCHAR},
-      updateTime = #{updateTime,jdbcType=TIMESTAMP},
-      updateUserId = #{updateUserId,jdbcType=VARCHAR}
-    where partyLifeMeetingId = #{partyLifeMeetingId,jdbcType=VARCHAR}
+      createTime = #{createtime,jdbcType=TIMESTAMP},
+      createUserId = #{createuserid,jdbcType=VARCHAR},
+      updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{updateuserid,jdbcType=VARCHAR},
+      personnel = #{personnel,jdbcType=VARCHAR},
+      result = #{result,jdbcType=VARCHAR},
+      compere = #{compere,jdbcType=VARCHAR}
+    where partyLifeMeetingId = #{partylifemeetingid,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/resources/mapping/PfPartylifemeetingPersonnelMapper.xml

@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ghsc.partybuild.mapper.PfPartylifemeetingPersonnelMapper">
+  <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.PfPartylifemeetingPersonnel">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="partyLifeMeetingId" jdbcType="VARCHAR" property="partylifemeetingid" />
+    <result column="rybm" jdbcType="VARCHAR" property="rybm" />
+    <result column="isAbsenteeism" jdbcType="INTEGER" property="isabsenteeism" />
+    <result column="absenteeismCause" jdbcType="VARCHAR" property="absenteeismcause" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createtime" />
+    <result column="createUserId" jdbcType="VARCHAR" property="createuserid" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updatetime" />
+    <result column="updateUserId" jdbcType="VARCHAR" property="updateuserid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, partyLifeMeetingId, rybm, isAbsenteeism, absenteeismCause, createTime, createUserId, 
+    updateTime, updateUserId
+  </sql>
+  <select id="selectByExample" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingPersonnelExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pf_partylifemeeting_personnel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pf_partylifemeeting_personnel
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pf_partylifemeeting_personnel
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingPersonnelExample">
+    delete from pf_partylifemeeting_personnel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingPersonnel">
+    insert into pf_partylifemeeting_personnel (id, partyLifeMeetingId, rybm, 
+      isAbsenteeism, absenteeismCause, createTime, 
+      createUserId, updateTime, updateUserId
+      )
+    values (#{id,jdbcType=VARCHAR}, #{partylifemeetingid,jdbcType=VARCHAR}, #{rybm,jdbcType=VARCHAR}, 
+      #{isabsenteeism,jdbcType=INTEGER}, #{absenteeismcause,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, 
+      #{createuserid,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, #{updateuserid,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingPersonnel">
+    insert into pf_partylifemeeting_personnel
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="partylifemeetingid != null">
+        partyLifeMeetingId,
+      </if>
+      <if test="rybm != null">
+        rybm,
+      </if>
+      <if test="isabsenteeism != null">
+        isAbsenteeism,
+      </if>
+      <if test="absenteeismcause != null">
+        absenteeismCause,
+      </if>
+      <if test="createtime != null">
+        createTime,
+      </if>
+      <if test="createuserid != null">
+        createUserId,
+      </if>
+      <if test="updatetime != null">
+        updateTime,
+      </if>
+      <if test="updateuserid != null">
+        updateUserId,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="partylifemeetingid != null">
+        #{partylifemeetingid,jdbcType=VARCHAR},
+      </if>
+      <if test="rybm != null">
+        #{rybm,jdbcType=VARCHAR},
+      </if>
+      <if test="isabsenteeism != null">
+        #{isabsenteeism,jdbcType=INTEGER},
+      </if>
+      <if test="absenteeismcause != null">
+        #{absenteeismcause,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createuserid != null">
+        #{createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateuserid != null">
+        #{updateuserid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingPersonnelExample" resultType="java.lang.Long">
+    select count(*) from pf_partylifemeeting_personnel
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pf_partylifemeeting_personnel
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.partylifemeetingid != null">
+        partyLifeMeetingId = #{record.partylifemeetingid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rybm != null">
+        rybm = #{record.rybm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isabsenteeism != null">
+        isAbsenteeism = #{record.isabsenteeism,jdbcType=INTEGER},
+      </if>
+      <if test="record.absenteeismcause != null">
+        absenteeismCause = #{record.absenteeismcause,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createtime != null">
+        createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createuserid != null">
+        createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null">
+        updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateuserid != null">
+        updateUserId = #{record.updateuserid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update pf_partylifemeeting_personnel
+    set id = #{record.id,jdbcType=VARCHAR},
+      partyLifeMeetingId = #{record.partylifemeetingid,jdbcType=VARCHAR},
+      rybm = #{record.rybm,jdbcType=VARCHAR},
+      isAbsenteeism = #{record.isabsenteeism,jdbcType=INTEGER},
+      absenteeismCause = #{record.absenteeismcause,jdbcType=VARCHAR},
+      createTime = #{record.createtime,jdbcType=TIMESTAMP},
+      createUserId = #{record.createuserid,jdbcType=VARCHAR},
+      updateTime = #{record.updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{record.updateuserid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingPersonnel">
+    update pf_partylifemeeting_personnel
+    <set>
+      <if test="partylifemeetingid != null">
+        partyLifeMeetingId = #{partylifemeetingid,jdbcType=VARCHAR},
+      </if>
+      <if test="rybm != null">
+        rybm = #{rybm,jdbcType=VARCHAR},
+      </if>
+      <if test="isabsenteeism != null">
+        isAbsenteeism = #{isabsenteeism,jdbcType=INTEGER},
+      </if>
+      <if test="absenteeismcause != null">
+        absenteeismCause = #{absenteeismcause,jdbcType=VARCHAR},
+      </if>
+      <if test="createtime != null">
+        createTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createuserid != null">
+        createUserId = #{createuserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateuserid != null">
+        updateUserId = #{updateuserid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ghsc.partybuild.model.PfPartylifemeetingPersonnel">
+    update pf_partylifemeeting_personnel
+    set partyLifeMeetingId = #{partylifemeetingid,jdbcType=VARCHAR},
+      rybm = #{rybm,jdbcType=VARCHAR},
+      isAbsenteeism = #{isabsenteeism,jdbcType=INTEGER},
+      absenteeismCause = #{absenteeismcause,jdbcType=VARCHAR},
+      createTime = #{createtime,jdbcType=TIMESTAMP},
+      createUserId = #{createuserid,jdbcType=VARCHAR},
+      updateTime = #{updatetime,jdbcType=TIMESTAMP},
+      updateUserId = #{updateuserid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/resources/static/app/main/app.js

@@ -3035,10 +3035,77 @@
             controller: "pf_meetingListCtrl",
             resolve: {
                 load: ['$ocLazyLoad', function ($ocLazyLoad) {
-                    $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
                     return $ocLazyLoad.load('../main/partylife/meeting/list.js?' + window.sysVersion);
                 }]
             }
+        }).state("home.pf_meetingEdit4", {
+            url: "pf_meetingEdit4",
+            params: { "partyLifeMeetingType": 4 },
+            templateUrl: "../main/partylife/meeting/edit.html?" + window.sysVersion,
+            controller: "pf_meetingEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingAdd4", {
+            url: "pf_meetingAdd4",
+            params: { "partyLifeMeetingType": 4 },
+            templateUrl: "../main/partylife/meeting/edit.html?" + window.sysVersion,
+            controller: "pf_meetingEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingDetail4", {
+            url: "pf_meetingDetail4",
+            templateUrl: "../main/partylife/meeting/detail.html?" + window.sysVersion,
+            controller: "pf_meetingDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/detail.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingList5", {
+            url: "pf_meetingList5",
+            params: { "partyLifeMeetingType": 5 },
+            templateUrl: "../main/partylife/meeting/list.html?" + window.sysVersion,
+            controller: "pf_meetingListCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/list.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingEdit5", {
+            url: "pf_meetingEdit5",
+            params: { "partyLifeMeetingType": 5 },
+            templateUrl: "../main/partylife/meeting/edit.html?" + window.sysVersion,
+            controller: "pf_meetingEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingAdd5", {
+            url: "pf_meetingAdd5",
+            params: { "partyLifeMeetingType": 5 },
+            templateUrl: "../main/partylife/meeting/edit.html?" + window.sysVersion,
+            controller: "pf_meetingEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_meetingDetail5", {
+            url: "pf_meetingDetail5",
+            templateUrl: "../main/partylife/meeting/detail.html?" + window.sysVersion,
+            controller: "pf_meetingDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/meeting/detail.js?' + window.sysVersion);
+                }]
+            }
         }).state("register", {
             url: "/register",
             templateUrl: "../main/partyUser/admit/register/edit.html?" + window.sysVersion,

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

@@ -0,0 +1,70 @@
+<titlemenu></titlemenu>
+<div class="dj-card">
+    <div class="dj-body" activate-input activate-select>
+        <div class="card">
+                <div class="dj-formtable">
+                    <table class="dj-table dj-table3">
+                        <tr>
+                            <th>所属党组织</th>
+                            <td>{{dataModel.partyname}}</td>
+                            <th>会议名称</th>
+                            <td>{{dataModel.title}}</td>
+                            <th>会议时间</th>
+                            <td>{{dataModel.meetingdate | date:'yyyy-MM-dd'}}</td>
+                        </tr>
+                        <tr>
+                            <th>主持人</th>
+                            <td>{{dataModel.compere}}</td>
+                            <th>会议地址</th>
+                            <td>{{dataModel.address}}</td>
+                        </tr>
+                    </table>
+                </div>
+                <div class="dj-formtable">
+                    <div class="table-responsive list-table-panel">
+                        <div class="list-table-title">
+                            <div class="table-title">
+                                出席人员列表({{dataModel.personnellist.length}}人)
+                            </div>
+                        </div>
+                        <div class="outoflow" style="max-height: 300px;">
+                            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                                <thead>
+                                <tr>
+                                    <th>序号</th>
+                                    <th>姓名</th>
+                                    <th>是否缺勤</th>
+                                    <th>缺勤原因</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr ng-repeat="it in dataModel.personnellist">
+                                    <td scope="row">{{$index+1}}</td>
+                                    <td>{{it.xm}}</td>
+                                    <td>{{it.isabsenteeismname}}</td>
+                                    <td style="min-width: 150px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.absenteeismcause}}</td>
+                                </tr>
+                                <tr ng-if="userList.length<=0">
+                                    <td colspan="7" style="text-align:center">暂无数据</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+                <div class="dj-formtable">
+                    <table class="dj-table">
+                        <tr>
+                            <th style="width: 5%;">列席人员</th>
+                            <td colspan="5">{{dataModel.personnel}}</td>
+                        </tr>
+                        <tr>
+                            <th style="width: 5%;">会议主要议程及结果</th>
+                            <td colspan="5">{{dataModel.result}}</td>
+                        </tr>
+                    </table>
+                </div>
+            <bsfiles ng-model="reqFileModel"/>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/main/partylife/meeting/detail.js

@@ -0,0 +1,36 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_meetingDetailCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.editParams = $bsRouterState.$params($scope);
+        $scope.dataModel = {};
+
+        $scope.reqFileModel = {
+            selectdata: {FileRefID: '', pageindex: 1, pagesize: 10, ptotal: 0},//查询参数：FileRefID为文件关联ID
+            filetype: 71,//文件类型
+            items: [],//列表数据地址
+            readonly: true,//是否只能查看
+            title: '附件',
+            addFileButton: '上传'
+        };
+
+        $scope.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/partylife/meeting/get",
+                params: {
+                    'id': $scope.editParams.id
+                }
+            }).then(function (result) {
+                $scope.dataModel = result.data.item;
+                $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.partylifemeetingid;
+            }, function (resp) {
+                $scope.showMsg('错误', '服务器错误：' + resp.data);
+            });
+        };
+
+        $scope.pagechange = function () {
+            $bsRouterState.$closeTab($scope);
+        };
+
+        $scope.getData();
+    });
+})(angular);

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

@@ -1,68 +1,153 @@
-<div class="modal" tabindex="-1" role="dialog">
-    <div class="modal-dialog" style="width: 850px;">
+<titlemenu></titlemenu>
+<div class="dj-card">
+    <div class="dj-body" activate-input activate-select>
         <div class="card">
-            <div class="header" dragable-header>
-                <button type="button" class="close" ng-click="$hide()">&times;</button>
-                <h4 class="modal-title">{{editParams.title}}</h4>
-            </div>
-            <div activate-input activate-select class="body">
                 <form class="form-horizontal" role="form" id="editForm"
                       name="editForm" ng-submit="save(editForm.$valid)" novalidate>
                     <div class="dj-formtable">
-                        <table class="dj-table">
+                        <table class="dj-table dj-table3">
                             <tr>
                                 <th>所属党组织</th>
-                                <td colspan="3">
+                                <td>
                                     <div class="input-group input-group-search"
                                          title="选择党组织" ng-click="selectParty()">
-                                        <input name="partyName" type="text" ng-model="dataModel.partyName"
+                                        <input name="partyname" type="text" ng-model="dataModel.partyname"
                                                class="form-control" ng-required="true"
                                                ng-disabled="true"/>
                                         <span class="input-group-addon"><i class="material-icons">search</i></span>
                                     </div>
-                                    <span ng-show="this.editForm.partyName.$invalid &&  this.editForm.$submitted"
+                                    <span ng-show="this.editForm.partyname.$invalid &&  this.editForm.$submitted"
                                           class="error">必填.</span>
                                 </td>
-                            </tr>
-                            <tr>
-                                <th>会议主题</th>
-                                <td colspan="3" ng-class="{ 'has-error' : this.editForm.title.$invalid &&  this.editForm.$submitted}">
-                                    <input type="text" class="form-control" name="title"
+                                <th>会议名称</th>
+                                <td ng-class="{ 'has-error' : this.editForm.title.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="title" autocomplete="off" autoclose="true"
                                            ng-model="dataModel.title" ng-required="true"/>
+                                    <span ng-show="this.editForm.title.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
-                            </tr>
-                            <tr>
                                 <th>会议时间</th>
-                                <td ng-class="{ 'has-error' : this.editForm.meetingDate.$invalid &&  this.editForm.$submitted}">
-                                    <input name="meetingDate" class="form-control"
-                                           autocomplete="off"
-                                           autoclose="true"
+                                <td ng-class="{ 'has-error' : this.editForm.meetingdate.$invalid &&  this.editForm.$submitted}">
+                                    <input name="meetingdate" class="form-control"
+                                           autocomplete="off" autoclose="true"
                                            data-date-format="yyyy-MM-dd" data-date-type="date"
-                                           ng-model="dataModel.meetingDate"
+                                           ng-model="dataModel.meetingdate"
                                            placeholder="" bs-datepicker ng-required="true"/>
-                                </td>
-                                <th>会议参加人数</th>
-                                <td ng-class="{ 'has-error' : this.editForm.userCount.$invalid &&  this.editForm.$submitted}">
-                                    <input type="number" class="form-control" name="userCount"
-                                           ng-model="dataModel.userCount" min="0" ng-required="true"/>
+                                    <span ng-show="this.editForm.meetingdate.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
                                 </td>
                             </tr>
                             <tr>
+                                <th>主持人</th>
+                                <td ng-class="{ 'has-error' : this.editForm.compere.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="compere"
+                                           autocomplete="off" autoclose="true" ng-model="dataModel.compere"/>
+                                </td>
                                 <th>会议地址</th>
                                 <td colspan="3" ng-class="{ 'has-error' : this.editForm.address.$invalid &&  this.editForm.$submitted}">
-                                    <input type="text" class="form-control" name="address"
-                                           ng-model="dataModel.address" ng-required="true"/>
+                                    <div class="form-group" style="margin-bottom: 4px;margin-top: 5px;">
+                                        <div class="form-line select-group" style="padding-bottom: 1px;">
+                                            <select ng-model="dataModel.address"
+                                                    ng-options="type as type for type in addressList"
+                                                    class="form-control"
+                                                    name="addressSelect">
+                                            </select>
+                                        </div>
+                                        <div class="form-line" style="width: 98%;margin-top: -29px;z-index: 9;"
+                                             ng-class="{ 'focused error' : this.editForm.address.$invalid &&  this.editForm.$submitted}">
+                                            <input type="text" name="address"
+                                                   ng-model="dataModel.address"
+                                                   maxlength="1000" autocomplete="off" autoclose="true"
+                                                   class="form-control"/>
+                                        </div>
+                                        <span ng-show="this.editForm.address.$invalid &&  this.editForm.$submitted"
+                                              class="error">必填.</span>
+                                    </div>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+
+                    <div class="dj-formtable">
+                        <div class="table-responsive list-table-panel">
+                            <div class="list-table-title">
+                                <div class="table-title">
+                                    出席人员列表({{dataModel.personnellist.length}}人)
+                                </div>
+                                <div class="table-tool">
+                                    <button type="button" class="btn btn-primary dropdown-toggle"
+                                            data-dataoptions="selectUserlist" title="新增"
+                                            ng-click="selectUser()"
+                                            bsselectdata-pro>
+                                        新增
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="outoflow" style="max-height: 300px;">
+                                <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                                    <thead>
+                                    <tr>
+                                        <th>序号</th>
+                                        <th>姓名</th>
+                                        <th>是否缺勤</th>
+                                        <th>缺勤原因</th>
+                                        <th>操作</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <tr ng-repeat="it in dataModel.personnellist">
+                                        <td scope="row">{{$index+1}}</td>
+                                        <td>{{it.xm}}</td>
+                                        <td>
+                                            <input type="checkbox" id="{{pageId}}_checkbox_{{$index+1}}"
+                                                   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>
+                                        </td>
+                                        <td>
+                                            <textarea name="absenteeismcause" ng-model="it.absenteeismcause"
+                                                      class="form-control" rows="3"></textarea>
+                                        </td>
+                                        <td class="text-center">
+                                            <button class="btn td-btn bg-pink waves-effect"
+                                                    ng-click="deleteUser($index)" title="删除">
+                                                删除
+                                            </button>
+                                        </td>
+                                    </tr>
+                                    <tr ng-if="userList.length<=0">
+                                        <td colspan="7" style="text-align:center">暂无数据</td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="dj-formtable">
+                        <table class="dj-table">
+                            <tr>
+                                <th style="width: 5%;">列席人员</th>
+                                <td colspan="5">
+                                    <input type="text" name="personnel" ng-model="dataModel.personnel"
+                                           autocomplete="off" autoclose="true" class="form-control"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th style="width: 5%;">会议主要议程及结果</th>
+                                <td colspan="5">
+                                   <textarea name="result" ng-model="dataModel.result"
+                                             class="form-control" rows="3"></textarea>
                                 </td>
                             </tr>
                         </table>
                     </div>
                     <bsfiles ng-model="reqFileModel"/>
                     <div class="form_foot">
-                        <button type="button" class="btn btn-default" ng-click="$hide()">取消</button>
+                        <button type="button" class="btn btn-default" ng-click="pagechange()">取消</button>
                         <button type="submit" class="btn btn-primary" form="editForm">保存</button>
                     </div>
                 </form>
-            </div>
         </div>
     </div>
 </div>

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

@@ -1,83 +1,168 @@
-var pfMeeting_editCtrl = function ($scope, $http, $alert, $loading,$partySelect) {
-    $scope.parentLoad = pfMeeting_editModal.parentLoad;
-    $scope.editParams = pfMeeting_editModal.params;
-    $scope.partyLifeMeetingType = $scope.editParams.partyLifeMeetingType;
-    $scope.dataModel = {};
-    //选择党支部
-    $scope.partyConfig = {
-        scope: $scope,
-        selectedKey: '',
-        selectedText: '',
-        selectedData: [],
-        isMulti: false,
-        isshowxz: 1
-    };
-    $partySelect.initServer($scope.partyConfig);
-    $scope.$watch("partyConfig.selectedKey", function (newVal, oldVal) {
-        if (newVal) {
-            $scope.dataModel.partyCode = $scope.partyConfig.selectedKey;
-            $scope.dataModel.partyName = $scope.partyConfig.selectedText;
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_meetingEditCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.editParams = $bsRouterState.$params($scope);
+        $scope.pageId = $bsRouterState.tabs.activeTab;
+        $scope.dataModel = {};
+        $scope.addressList = [];
 
-            $scope.partyConfig.selectedText = "";
-            $scope.partyConfig.selectedKey = "";
-        }
-    }, true);
-    $scope.selectParty = function () {
-        $partySelect.showModal();
-    };
+        $scope.reqFileModel = {
+            selectdata: {FileRefID: '', pageindex: 1, pagesize: 10, ptotal: 0},//查询参数：FileRefID为文件关联ID
+            filetype: 71,//文件类型
+            items: [],//列表数据地址
+            readonly: false,//是否只能查看
+            title: '附件',
+            addFileButton: '上传'
+        };
 
-    $scope.reqFileModel = {
-        selectdata: {FileRefID: '', pageindex: 1, pagesize: 10, ptotal: 0},//查询参数：FileRefID为文件关联ID
-        filetype: 71,//文件类型
-        items: [],//列表数据地址
-        readonly: false,//是否只能查看
-        title: '附件',
-        addFileButton: '上传'
-    };
+        //选择党支部
+        $scope.partyConfig = {
+            scope: $scope,
+            selectedKey: '',
+            selectedText: '',
+            selectedData: [],
+            isMulti: false,
+            isshowxz: 1
+        };
+        $partySelect.initServer($scope.partyConfig);
+        $scope.$watch("partyConfig.selectedKey", function (newVal, oldVal) {
+            if (newVal) {
+                $scope.dataModel.partycode = $scope.partyConfig.selectedKey;
+                $scope.dataModel.partyname = $scope.partyConfig.selectedText;
 
-    $scope.getData = function () {
-        $http
-        ({
-            method: 'get', url: "../../api/partylife/meeting/get",
-            params: {
-                'id': $scope.editParams.id
+                $scope.getUserList();
+                $scope.partyConfig.selectedText = "";
+                $scope.partyConfig.selectedKey = "";
+            }
+        }, true);
+        $scope.selectParty = function () {
+            $partySelect.showModal();
+        };
+
+        //选择会议成员
+        $scope.selectUserlist = {
+            url: "../../api/partyUser/getPartyUserList",
+            title: '人员选择',
+            isMulti: true,
+            selectData: {xm: '姓名', szdzb: '所在组织架构'},
+            columns: {XM: '姓名', XBMC: '性别', JG: '籍贯', DZZMC: '所在组织架构'},
+            selectLabelKey: 'XM',
+            selectValuekey: 'RYJBXXBS',
+            selectedValueData: '',
+            selectedLabeData: '',
+            selectedJData: [],
+            selectParams: {
+                dzzdm: $scope.dataModel.partycode,
+                removeUsers: '',
+                //szdzbdm: $scope.dataModel.shyktype == 2 ? $scope.dataModel.partycode : '',
+                ryzt: '2,3' //预备党员，正式党员
+            }
+        };
+        $scope.$watch('selectUserlist.selectedValueData', function (newVal) {
+            if (newVal != '' && newVal != undefined) {
+                $http({
+                    method: 'get',
+                    url: '../../api/partyUser/getPartyUserList',
+                    params: {
+                        userIds: newVal,
+                        pageindex: 1,
+                        pagesize: 10000
+                    }
+                }).then(function (result) {
+                    $loading.hide();
+                    result.data.item.list.forEach(item => {
+                        item.SIGNINSTATUS = 2;
+                    });
+                    let data = [];
+                    result.data.item.list.forEach(x=>{
+                        data.push({rybm: x.RYBM, ryjbxxbs: x.RYJBXXBS, xm: x.XM, isabsenteeism: 0, absenteeismcause: ''});
+                    })
+                    $scope.dataModel.personnellist = $scope.dataModel.personnellist.concat(data);
+
+                    $scope.selectUserlist.selectedValueData = "";
+                    $scope.selectUserlist.selectedLabeData = "";
+                }, function (resp) {
+                    $loading.hide();
+                    $scope.showMsg('错误', '服务器错误');
+                });
             }
-        }).then(function (result) {
-            $scope.dataModel = result.data.item;
-            $scope.dataModel.partyLifeMeetingType = $scope.partyLifeMeetingType;
-            $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.partyLifeMeetingId;
-        }, function (resp) {
-            $scope.showMsg('错误', '服务器错误：' + resp.data);
         });
-    };
+        $scope.$watch('dataModel.personnellist', function (newVal) {
+             if($scope.dataModel.personnellist){
+                 $scope.setRemoveUser();
+             }
+        }, true);
+
+        $scope.setRemoveUser = function () {
+            $scope.selectUserlist.selectParams.removeUsers = "";
+            angular.forEach($scope.dataModel.personnellist, function (val, index) {
+                $scope.selectUserlist.selectParams.removeUsers += val.ryjbxxbs + ','
+            });
+        };
+
+        //人员操作
+        $scope.deleteUser = function (index) {
+            if (confirm("请确认是否需要移除参会人员！")) {
+                $scope.dataModel.personnellist.splice(index, 1);
+            }
+        };
 
-    $scope.save = function (isflag) {
-        if (isflag) {
-            $loading.show();
+        $scope.getAddressList = function () {
             $http({
-                method: "post",
-                url: "../../api/partylife/meeting/save",
-                data: $scope.dataModel
+                method: 'get',
+                url: '../../api/partylife/meeting/getUserAddressList',
+                params: {}
             }).then(function (result) {
-                $loading.hide();
-                if (result.data.success) {
-                    $scope.showMsg('成功', "操作成功");
-                    //重新刷新列表
-                    $scope.parentLoad();
-                    $scope.$hide();
-                } else {
-                    $scope.showMsg('失败', result.data.msg);
+                $scope.addressList = result.data.item;
+            }, function (resp) {
+
+            });
+        };
+
+        $scope.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/partylife/meeting/get",
+                params: {
+                    'id': $scope.editParams.id
                 }
+            }).then(function (result) {
+                $scope.dataModel = result.data.item;
+                $scope.dataModel.partylifemeetingtype = $scope.editParams.partyLifeMeetingType;
+                $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.partylifemeetingid;
             }, function (resp) {
-                $loading.hide();
                 $scope.showMsg('错误', '服务器错误：' + resp.data);
             });
-        }
-    };
+        };
 
-    $scope.getData();
+        $scope.save = function (isflag) {
+            if (isflag) {
+                $loading.show();
+                $http({
+                    method: "post",
+                    url: "../../api/partylife/meeting/save",
+                    data: $scope.dataModel
+                }).then(function (result) {
+                    $loading.hide();
+                    if (result.data.success) {
+                        $scope.showMsg('成功', "操作成功");
+                        $scope.pagechange();
+                        //重新刷新列表
+                        $scope.$emit("tabReloadData", {name: 'pf_meetingListCtrl', data: 1});
+                    } else {
+                        $scope.showMsg('失败', result.data.msg);
+                    }
+                }, function (resp) {
+                    $loading.hide();
+                    $scope.showMsg('错误', '服务器错误：' + resp.data);
+                });
+            }
+        };
 
-};
+        $scope.pagechange = function () {
+            $bsRouterState.$closeTab($scope);
+        };
 
-//定义模态框
-var pfMeeting_editModal;
+        $scope.getData();
+        $scope.getAddressList();
+    });
+})(angular);

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

@@ -27,6 +27,20 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="col-lg-2 col-md-2 dj-label">
+                                        <label>会议主题</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <input name="name" class="form-control" type="text"
+                                                       ng-keypress="($event.which === 13)?search():0"
+                                                       ng-model="selectparams.title"
+                                                       placeholder=""/>
+
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div class="col-lg-2 col-md-2 dj-label">
                                         <label>会议时间</label>
                                     </div>
@@ -50,20 +64,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-lg-2 col-md-2 dj-label">
-                                        <label>会议主题</label>
-                                    </div>
-                                    <div class="col-lg-2 col-md-2">
-                                        <div class="form-group">
-                                            <div class="form-line">
-                                                <input name="name" class="form-control" type="text"
-                                                       ng-keypress="($event.which === 13)?search():0"
-                                                       ng-model="selectparams.title"
-                                                       placeholder=""/>
-
-                                            </div>
-                                        </div>
-                                    </div>
                                 </div>
                             </form>
                         </div>
@@ -78,7 +78,10 @@
                     <div class="search-btn" style="margin-right: 20px;">
                         <div style="float: right">
                             <button class="btn btn-default1"
-                                    ng-click="edit()">新增
+                                    ng-click="add()">新增
+                            </button>
+                            <button class="btn btn-default1"
+                                    ng-click="delete()">删除
                             </button>
                             <button class="btn btn-default1"
                                     ng-click="export()">导出
@@ -92,28 +95,45 @@
                             <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
                                 <thead>
                                 <tr>
+                                    <th>
+                                        <input type="checkbox" id="{{pageId}}_md_checkbox_all"
+                                               class="filled-in chk-col-red" ng-checked="isAll==true"
+                                               ng-click="selectAll()"/>
+                                        <label class="checkbox_lable" style="height: 10px;"
+                                               for="{{pageId}}_md_checkbox_all"></label></th>
                                     <th>序号</th>
                                     <th>所属党组织</th>
-                                    <th>会议主题</th>
+                                    <th>会议名称</th>
                                     <th>会议时间</th>
-                                    <th>会议参加人数</th>
                                     <th>会议地点</th>
+                                    <th>主持人</th>
+                                    <th>出席人员数量</th>
+                                    <th>缺勤人员数量</th>
                                     <th>创建人</th>
                                     <th>创建时间</th>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 <tr ng-repeat="it in dataList">
+                                    <td class="text-center">
+                                        <input type="checkbox" id="{{pageId}}_md_checkbox_{{$index+1}}"
+                                               class="filled-in chk-col-red" ng-checked="it.checked==1"
+                                               ng-click="it.checked==1?it.checked=0:it.checked=1"/>
+                                        <label class="checkbox_lable" style="top:6px;"
+                                               for="{{pageId}}_md_checkbox_{{$index+1}}"></label>
+                                    </td>
                                     <td scope="row" class="text-center">
                                         {{selectparams.pagesize*(selectparams.pageindex-1)+$index+1}}
                                     </td>
-                                    <td>{{it.partyName}}</td>
+                                    <td>{{it.partyname}}</td>
                                     <td>{{it.title}}</td>
-                                    <td>{{it.meetingDate | date:'yyyy-MM-dd'}}</td>
-                                    <td>{{it.userCount}}</td>
+                                    <td>{{it.meetingdate | date:'yyyy-MM-dd'}}</td>
                                     <td>{{it.address}}</td>
-                                    <td>{{it.createUserName}}</td>
-                                    <td>{{it.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                    <td>{{it.compere}}</td>
+                                    <td>{{it.attendance}}</td>
+                                    <td>{{it.absentcount}}</td>
+                                    <td>{{it.createusername}}</td>
+                                    <td>{{it.createtime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                 </tr>
                                 <tr ng-if="dataList.length<=0">
                                     <td colspan="15" style="text-align:center">暂无数据</td>
@@ -132,14 +152,17 @@
                                 <tr ng-repeat="it in dataList" zero-table-height>
                                     <td>
                                         <button class="btn td-btn bg-light-green waves-effect"
-                                                ng-click="edit(it.partyLifeMeetingId)"
+                                                ng-click="show(it.partylifemeetingid)"
+                                                title="查看">
+                                            查看
+                                        </button>
+                                        <button
+                                                role-permission-code="brandMgList.btnEdit"
+                                                class="btn td-btn bg-light-green waves-effect"
+                                                ng-click="edit(it.partylifemeetingid)"
                                                 title="修改">
                                             修改
                                         </button>
-                                        <button ng-if="!it.isProcess" class="btn td-btn bg-pink waves-effect"
-                                                ng-click="delete(it.partyLifeMeetingId)" title="删除">
-                                            删除
-                                        </button>
                                     </td>
                                 </tr>
                                 <tr ng-if="pageInfo.ptotal==0">

src/main/resources/static/app/main/partylife/meeting/list.js

@@ -5,7 +5,11 @@
         $scope.isShow = false;
         $scope.moreTxt = "更多";
         $scope.partyLifeMeetingType = $state.params.partyLifeMeetingType;
-        $scope.title = "";
+        $scope.isAll = false;
+        $scope.pageId = "meetingList";
+        $scope.tabNameAdd = "home.pf_meetingAdd" + $scope.partyLifeMeetingType;
+        $scope.tabNameEdit = "home.pf_meetingEdit" + $scope.partyLifeMeetingType;
+        $scope.tabNameDetail = "home.pf_meetingDetail" + $scope.partyLifeMeetingType;
 
         //定义数据集合
         $scope.dataList = []; //列表数据
@@ -27,23 +31,15 @@
             endDate: null
         };
         $scope.pageInfo = {ptotal: 0};
-        $scope.sexList = [];
-        //定义模态框
-        pfMeeting_editCtrl.$inject = ['$scope', '$http', '$alert', '$loading','$partySelect'];
-        pfMeeting_editModal = $modal({
-            resolve: {
-                load: ['$ocLazyLoad', function ($ocLazyLoad) {
-                }]
-            },
-            scope: $scope,
-            controller: pfMeeting_editCtrl,
-            templateUrl: '../main/partylife/meeting/edit.html',
-            show: false,
-            animation: 'am-fade-and-slide-top'
+
+        $scope.$on('tabChildReloadData', function (event, data) {
+            if (data.name == 'pf_meetingListCtrl') {
+                $scope.loadData();
+            }
         });
 
         //加载列表数据
-        $scope.getList = function () {
+        $scope.loadData = function () {
             $http
             ({
                 method: 'get', url: '../../api/partylife/meeting/getList', params: $scope.selectparams
@@ -56,17 +52,44 @@
         };
 
         $scope.search = function () {
-            $scope.getList();
+            $scope.loadData();
+        };
+
+        $scope.selectAll = function () {
+            $scope.isAll = !$scope.isAll;
+            angular.forEach($scope.dataList, function (item) {
+                item.checked = $scope.isAll ? 1 : 0;
+            });
+        };
+
+        //查看
+        $scope.show = function (id) {
+            $bsRouterState.$closeTabName($scope.tabNameDetail);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameDetail, {
+                    id: id
+                });
+            }, 100);
         };
 
+        //新增
+        $scope.add = function () {
+            $bsRouterState.$closeTabName($scope.tabNameAdd);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameAdd, {
+                    id: ''
+                });
+            }, 100);
+        };
+
+        //修改
         $scope.edit = function (id) {
-            pfMeeting_editModal.params = {
-                id: id,
-                partyLifeMeetingType: $scope.partyLifeMeetingType,
-                title: (id ? "修改" : "新增") + $scope.title
-            };
-            pfMeeting_editModal.parentLoad = $scope.getList;
-            pfMeeting_editModal.$promise.then(pfMeeting_editModal.show);
+            $bsRouterState.$closeTabName($scope.tabNameEdit);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameEdit, {
+                    id: id
+                });
+            }, 100);
         };
 
         $scope.export = function () {
@@ -83,7 +106,7 @@
             if (id)
                 ids.push(id);
             else
-                ids = $scope.dataList.filter(it => it.rowChecked == true).map(it => it.leaderTeamId);
+                ids = $scope.dataList.filter(it => it.checked == true).map(it => it.partylifemeetingid);
 
             if (ids.length == 0) {
                 $scope.showMsg('消息', "请选择需要删除的数据");
@@ -103,7 +126,7 @@
                     if (result.data.success) {
                         $scope.showMsg('成功', result.data.msg);
                         //重新刷新列表
-                        $scope.getList();
+                        $scope.loadData();
                     } else {
                         $scope.showMsg('失败', result.data.msg);
                     }
@@ -113,21 +136,9 @@
             }
         };
 
-        $scope.getPartyLifeMeetingTypeList = function () {
-            $http({
-                method: 'get',
-                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
-                params: {
-                    dicTypeKey: 'PartyLifeMeetingType'
-                }
-            }).then(function (result) {
-                $scope.title = result.data.filter(it => it.dickey == $scope.partyLifeMeetingType)[0].dicvalue;
-            });
-        };
-
         $scope.$watch("selectparams.pageindex", function (newVal, oldVal) {
             if ($scope.pageInfo.ptotal > 0) {
-                $scope.getList();
+                $scope.loadData();
             }
         });
         $scope.$watch("treeparams.selectdzzdm", function (newVal, oldVal) {
@@ -138,7 +149,7 @@
 
                 $scope.selectparams.dzzdm = $scope.treeparams.selectdzzdm;
 
-                $scope.getList();
+                $scope.loadData();
             }
         });
         $scope.setisunfold = function () {
@@ -154,7 +165,7 @@
             }
         };
 
-        $scope.getList();
-        $scope.getPartyLifeMeetingTypeList();
+        $scope.loadData();
+        // $scope.getPartyLifeMeetingTypeList();
     });
 })(angular);