组织生活-专题建设-党建“双创”工作

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

@@ -0,0 +1,184 @@
+package com.ghsc.partybuild.controller.partyLife;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.ghsc.partybuild.controller.jsonmodel.RequsetData;
+import com.ghsc.partybuild.service.UserService;
+import com.ghsc.partybuild.service.partyLife.PfDjscgzService;
+import com.ghsc.partybuild.util.DateUtils;
+import com.ghsc.partybuild.util.ExcelHelper;
+import com.ghsc.partybuild.util.JsonMapper;
+import com.ghsc.partybuild.vo.partyLife.PfDjscgzVo;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/api/partylife/djscgz")
+public class PfDjscgzController {
+    @Autowired
+    private PfDjscgzService PfDjscgzService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private DateUtils dateUtils;
+    private static final String dateTimeFormat = "yyyy-MM-dd";
+
+    @ResponseBody
+    @GetMapping("/getList")
+    public RequsetData<PageInfo<PfDjscgzVo>> getList(int pageindex, int pagesize, @RequestParam(required = false) String dzzdm, 
+                                                             @RequestParam(required = false) String pxqdsjks, @RequestParam(required = false) String pxqdsjjs,
+                                                             @RequestParam(required = false) String pxjgqdsjks, @RequestParam(required = false) String pxjgqdsjjs,
+                                                             @RequestParam(required = false) String pxjb, @RequestParam(required = false) String pxlb) {
+
+        RequsetData<PageInfo<PfDjscgzVo>> result = new RequsetData<>();
+        result.setItem(PfDjscgzService.getList(pageindex, pagesize, null, dzzdm, pxqdsjks, pxqdsjjs, pxjgqdsjks, pxjgqdsjjs, pxjb, pxlb));
+        return result;
+    }
+
+    @ResponseBody
+    @GetMapping("/get")
+    public RequsetData<PfDjscgzVo> get(@RequestParam(required = false) String id) {
+        RequsetData<PfDjscgzVo> res = new RequsetData<>();
+
+        PfDjscgzVo model = PfDjscgzService.getPfDjscgzById(id);
+        if (model == null) {
+            model = new PfDjscgzVo();
+            model.setId(UUID.randomUUID().toString());
+        }
+
+        res.setItem(model);
+        return res;
+    }
+
+    @ResponseBody
+    @PostMapping("/save")
+    public RequsetData<String> save(@RequestBody PfDjscgzVo data) {
+        RequsetData<String> result = new RequsetData<String>();
+        int count = 0;
+        String message = "";
+
+        try {
+            count = PfDjscgzService.save(data, userService.getLoginUser().getUserid());
+        } catch (Exception e) {
+            e.printStackTrace();
+            message = e.toString();
+        }
+
+        if (count > 0) {
+            result.setSuccess(true);
+            result.setMsg("保存成功！");
+        } else {
+            result.setSuccess(false);
+            result.setMsg("保存失败！" + message);
+        }
+        return result;
+    }
+
+    @ResponseBody
+    @PostMapping("/delete")
+    public RequsetData<Integer> delete(@RequestBody Map<String, Object> reqMap) {
+        RequsetData<Integer> result = new RequsetData<>();
+        int count = 0;
+        String message = "";
+
+        try {
+            List<String> idList = JsonMapper.jsonToObject(reqMap.get("ids").toString(), new TypeReference<List<String>>() {
+            });
+            count = PfDjscgzService.delete(idList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            message = e.toString();
+        }
+
+        if (count > 0) {
+            result.setItem(count);
+            result.setSuccess(true);
+            result.setMsg("删除成功！");
+        } else {
+            result.setSuccess(false);
+            result.setMsg("删除失败！" + message);
+        }
+        return result;
+    }
+
+    @RequestMapping(value = "/export", method = RequestMethod.GET)
+    public void exportLeaderTeam(HttpServletResponse response, @RequestParam(required = false) String dzzdm,
+                                 @RequestParam(required = false) String pxqdsjks, @RequestParam(required = false) String pxqdsjjs,
+                                 @RequestParam(required = false) String pxjgqdsjks, @RequestParam(required = false) String pxjgqdsjjs,
+                                 @RequestParam(required = false) String pxjb, @RequestParam(required = false) String pxlb) throws Exception {
+        /**查询数据**/
+        List<PfDjscgzVo> dataList = PfDjscgzService.getList(1, 100000, null, dzzdm, pxqdsjks, pxqdsjjs, pxjgqdsjks, pxjgqdsjjs, pxjb, pxlb).getList();
+
+        ExcelHelper excelHelper = new ExcelHelper();
+        ExcelHelper.ExcelData data = excelHelper.new ExcelData();
+
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFSheet sheet = wb.createSheet("党建“双创”工作");
+        sheet.setColumnWidth(1, 256 * 30);
+        sheet.setColumnWidth(2, 256 * 20);
+        sheet.setColumnWidth(3, 256 * 20);
+        sheet.setColumnWidth(4, 256 * 25);
+        sheet.setColumnWidth(5, 256 * 25);
+        sheet.setColumnWidth(6, 256 * 50);
+        sheet.setColumnWidth(7, 256 * 10);
+        sheet.setColumnWidth(8, 256 * 20);
+
+        try{
+
+            //列名
+            List<String> titles = new ArrayList();
+            titles.add("序号");
+            titles.add("党组织");
+            titles.add("评选启动时间");
+            titles.add("评选结果确定时间");
+            titles.add("评选级别");
+            titles.add("评选类别");
+            titles.add("主要工作步骤");
+            titles.add("创建人");
+            titles.add("创建时间");
+            data.setTitles(titles);
+
+            //数据
+            List<List<Object>> rows = new ArrayList();
+            List<List<XSSFCellStyle>> cellStyles = new ArrayList();
+            XSSFCellStyle defaultStyle = excelHelper.setDefaultBorder(wb);
+
+            int i = 0;
+            for (PfDjscgzVo item : dataList) {
+                List<Object> row = new ArrayList();
+                row.add(++i);
+                row.add(item.getDzzmc());
+                row.add(item.getPxqdsj());
+                row.add(item.getPxjgqdsj());
+                row.add(item.getPxjbtypename());
+                row.add(item.getPxlbtypename());
+                row.add(item.getZygzbz());
+                row.add(item.getCreateusername());
+                row.add(dateUtils.dateToStrFormat(item.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+                rows.add(row);
+
+                List<XSSFCellStyle> styles= new ArrayList<>();
+                for(int j=0;j<10;j++){
+                    styles.add(defaultStyle);
+                }
+                cellStyles.add(styles);
+            }
+
+            data.setRows(rows);
+            data.setStyleList(cellStyles);
+        } catch (Exception ex) {
+            wb.close();
+        }
+
+        excelHelper.exportExcelNew(wb , response,  "党建“双创”工作.xlsx", data);
+    }
+}

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

@@ -0,0 +1,14 @@
+package com.ghsc.partybuild.mapper;
+
+import com.ghsc.partybuild.vo.partyLife.PfDjscgzVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PfDjscgzCQuery {
+    List<PfDjscgzVo> selectPfDjscgzList(@Param("id") String id, @Param("dzzdm") String dzzdm,
+                                        @Param("pxqdsjks") String pxqdsjks, @Param("pxqdsjjs") String pxqdsjjs,
+                                        @Param("pxjgqdsjks") String pxjgqdsjks, @Param("pxjgqdsjjs") String pxjgqdsjjs,
+                                        @Param("pxjb") String pxjb, @Param("pxlb") String pxlb);
+
+}

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

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

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

@@ -0,0 +1,115 @@
+package com.ghsc.partybuild.model;
+
+import java.util.Date;
+
+public class PfDjscgz {
+    private String id;
+
+    private String dzzdm;
+
+    private String pxqdsj;
+
+    private String pxjgqdsj;
+
+    private Integer pxjb;
+
+    private Integer pxlb;
+
+    private String zygzbz;
+
+    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 getDzzdm() {
+        return dzzdm;
+    }
+
+    public void setDzzdm(String dzzdm) {
+        this.dzzdm = dzzdm == null ? null : dzzdm.trim();
+    }
+
+    public String getPxqdsj() {
+        return pxqdsj;
+    }
+
+    public void setPxqdsj(String pxqdsj) {
+        this.pxqdsj = pxqdsj == null ? null : pxqdsj.trim();
+    }
+
+    public String getPxjgqdsj() {
+        return pxjgqdsj;
+    }
+
+    public void setPxjgqdsj(String pxjgqdsj) {
+        this.pxjgqdsj = pxjgqdsj == null ? null : pxjgqdsj.trim();
+    }
+
+    public Integer getPxjb() {
+        return pxjb;
+    }
+
+    public void setPxjb(Integer pxjb) {
+        this.pxjb = pxjb;
+    }
+
+    public Integer getPxlb() {
+        return pxlb;
+    }
+
+    public void setPxlb(Integer pxlb) {
+        this.pxlb = pxlb;
+    }
+
+    public String getZygzbz() {
+        return zygzbz;
+    }
+
+    public void setZygzbz(String zygzbz) {
+        this.zygzbz = zygzbz == null ? null : zygzbz.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/PfDjscgzExample.java

@@ -0,0 +1,931 @@
+package com.ghsc.partybuild.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PfDjscgzExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PfDjscgzExample() {
+        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 andDzzdmIsNull() {
+            addCriterion("dzzdm is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmIsNotNull() {
+            addCriterion("dzzdm is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmEqualTo(String value) {
+            addCriterion("dzzdm =", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmNotEqualTo(String value) {
+            addCriterion("dzzdm <>", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmGreaterThan(String value) {
+            addCriterion("dzzdm >", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmGreaterThanOrEqualTo(String value) {
+            addCriterion("dzzdm >=", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmLessThan(String value) {
+            addCriterion("dzzdm <", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmLessThanOrEqualTo(String value) {
+            addCriterion("dzzdm <=", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmLike(String value) {
+            addCriterion("dzzdm like", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmNotLike(String value) {
+            addCriterion("dzzdm not like", value, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmIn(List<String> values) {
+            addCriterion("dzzdm in", values, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmNotIn(List<String> values) {
+            addCriterion("dzzdm not in", values, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmBetween(String value1, String value2) {
+            addCriterion("dzzdm between", value1, value2, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andDzzdmNotBetween(String value1, String value2) {
+            addCriterion("dzzdm not between", value1, value2, "dzzdm");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjIsNull() {
+            addCriterion("pxqdsj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjIsNotNull() {
+            addCriterion("pxqdsj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjEqualTo(String value) {
+            addCriterion("pxqdsj =", value, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjNotEqualTo(String value) {
+            addCriterion("pxqdsj <>", value, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjGreaterThan(String value) {
+            addCriterion("pxqdsj >", value, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjGreaterThanOrEqualTo(String value) {
+            addCriterion("pxqdsj >=", value, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjLessThan(String value) {
+            addCriterion("pxqdsj <", value, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjLessThanOrEqualTo(String value) {
+            addCriterion("pxqdsj <=", value, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjLike(String value) {
+            addCriterion("pxqdsj like", value, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjNotLike(String value) {
+            addCriterion("pxqdsj not like", value, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjIn(List<String> values) {
+            addCriterion("pxqdsj in", values, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjNotIn(List<String> values) {
+            addCriterion("pxqdsj not in", values, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjBetween(String value1, String value2) {
+            addCriterion("pxqdsj between", value1, value2, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxqdsjNotBetween(String value1, String value2) {
+            addCriterion("pxqdsj not between", value1, value2, "pxqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjIsNull() {
+            addCriterion("pxjgqdsj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjIsNotNull() {
+            addCriterion("pxjgqdsj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjEqualTo(String value) {
+            addCriterion("pxjgqdsj =", value, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjNotEqualTo(String value) {
+            addCriterion("pxjgqdsj <>", value, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjGreaterThan(String value) {
+            addCriterion("pxjgqdsj >", value, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjGreaterThanOrEqualTo(String value) {
+            addCriterion("pxjgqdsj >=", value, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjLessThan(String value) {
+            addCriterion("pxjgqdsj <", value, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjLessThanOrEqualTo(String value) {
+            addCriterion("pxjgqdsj <=", value, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjLike(String value) {
+            addCriterion("pxjgqdsj like", value, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjNotLike(String value) {
+            addCriterion("pxjgqdsj not like", value, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjIn(List<String> values) {
+            addCriterion("pxjgqdsj in", values, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjNotIn(List<String> values) {
+            addCriterion("pxjgqdsj not in", values, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjBetween(String value1, String value2) {
+            addCriterion("pxjgqdsj between", value1, value2, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjgqdsjNotBetween(String value1, String value2) {
+            addCriterion("pxjgqdsj not between", value1, value2, "pxjgqdsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbIsNull() {
+            addCriterion("pxjb is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbIsNotNull() {
+            addCriterion("pxjb is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbEqualTo(Integer value) {
+            addCriterion("pxjb =", value, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbNotEqualTo(Integer value) {
+            addCriterion("pxjb <>", value, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbGreaterThan(Integer value) {
+            addCriterion("pxjb >", value, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pxjb >=", value, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbLessThan(Integer value) {
+            addCriterion("pxjb <", value, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbLessThanOrEqualTo(Integer value) {
+            addCriterion("pxjb <=", value, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbIn(List<Integer> values) {
+            addCriterion("pxjb in", values, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbNotIn(List<Integer> values) {
+            addCriterion("pxjb not in", values, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbBetween(Integer value1, Integer value2) {
+            addCriterion("pxjb between", value1, value2, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxjbNotBetween(Integer value1, Integer value2) {
+            addCriterion("pxjb not between", value1, value2, "pxjb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbIsNull() {
+            addCriterion("pxlb is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbIsNotNull() {
+            addCriterion("pxlb is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbEqualTo(Integer value) {
+            addCriterion("pxlb =", value, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbNotEqualTo(Integer value) {
+            addCriterion("pxlb <>", value, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbGreaterThan(Integer value) {
+            addCriterion("pxlb >", value, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pxlb >=", value, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbLessThan(Integer value) {
+            addCriterion("pxlb <", value, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbLessThanOrEqualTo(Integer value) {
+            addCriterion("pxlb <=", value, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbIn(List<Integer> values) {
+            addCriterion("pxlb in", values, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbNotIn(List<Integer> values) {
+            addCriterion("pxlb not in", values, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbBetween(Integer value1, Integer value2) {
+            addCriterion("pxlb between", value1, value2, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andPxlbNotBetween(Integer value1, Integer value2) {
+            addCriterion("pxlb not between", value1, value2, "pxlb");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzIsNull() {
+            addCriterion("zygzbz is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzIsNotNull() {
+            addCriterion("zygzbz is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzEqualTo(String value) {
+            addCriterion("zygzbz =", value, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzNotEqualTo(String value) {
+            addCriterion("zygzbz <>", value, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzGreaterThan(String value) {
+            addCriterion("zygzbz >", value, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzGreaterThanOrEqualTo(String value) {
+            addCriterion("zygzbz >=", value, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzLessThan(String value) {
+            addCriterion("zygzbz <", value, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzLessThanOrEqualTo(String value) {
+            addCriterion("zygzbz <=", value, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzLike(String value) {
+            addCriterion("zygzbz like", value, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzNotLike(String value) {
+            addCriterion("zygzbz not like", value, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzIn(List<String> values) {
+            addCriterion("zygzbz in", values, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzNotIn(List<String> values) {
+            addCriterion("zygzbz not in", values, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzBetween(String value1, String value2) {
+            addCriterion("zygzbz between", value1, value2, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZygzbzNotBetween(String value1, String value2) {
+            addCriterion("zygzbz not between", value1, value2, "zygzbz");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridIsNull() {
+            addCriterion("create_userid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridIsNotNull() {
+            addCriterion("create_userid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridEqualTo(String value) {
+            addCriterion("create_userid =", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridNotEqualTo(String value) {
+            addCriterion("create_userid <>", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridGreaterThan(String value) {
+            addCriterion("create_userid >", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridGreaterThanOrEqualTo(String value) {
+            addCriterion("create_userid >=", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridLessThan(String value) {
+            addCriterion("create_userid <", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridLessThanOrEqualTo(String value) {
+            addCriterion("create_userid <=", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridLike(String value) {
+            addCriterion("create_userid like", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridNotLike(String value) {
+            addCriterion("create_userid not like", value, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridIn(List<String> values) {
+            addCriterion("create_userid in", values, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridNotIn(List<String> values) {
+            addCriterion("create_userid not in", values, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridBetween(String value1, String value2) {
+            addCriterion("create_userid between", value1, value2, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUseridNotBetween(String value1, String value2) {
+            addCriterion("create_userid not between", value1, value2, "createUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridIsNull() {
+            addCriterion("update_userid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridIsNotNull() {
+            addCriterion("update_userid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridEqualTo(String value) {
+            addCriterion("update_userid =", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridNotEqualTo(String value) {
+            addCriterion("update_userid <>", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridGreaterThan(String value) {
+            addCriterion("update_userid >", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridGreaterThanOrEqualTo(String value) {
+            addCriterion("update_userid >=", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridLessThan(String value) {
+            addCriterion("update_userid <", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridLessThanOrEqualTo(String value) {
+            addCriterion("update_userid <=", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridLike(String value) {
+            addCriterion("update_userid like", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridNotLike(String value) {
+            addCriterion("update_userid not like", value, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridIn(List<String> values) {
+            addCriterion("update_userid in", values, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridNotIn(List<String> values) {
+            addCriterion("update_userid not in", values, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridBetween(String value1, String value2) {
+            addCriterion("update_userid between", value1, value2, "updateUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUseridNotBetween(String value1, String value2) {
+            addCriterion("update_userid 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/PfDjscgzServiceImpl.java

@@ -0,0 +1,101 @@
+package com.ghsc.partybuild.service.impl.partyLife;
+
+import com.ghsc.partybuild.mapper.PfDjscgzCQuery;
+import com.ghsc.partybuild.mapper.PfDjscgzMapper;
+import com.ghsc.partybuild.model.CfDictionary;
+import com.ghsc.partybuild.model.PfDjscgz;
+import com.ghsc.partybuild.model.PfDjscgzExample;
+import com.ghsc.partybuild.service.DictionaryService;
+import com.ghsc.partybuild.service.partyLife.PfDjscgzService;
+import com.ghsc.partybuild.util.StringUtils;
+import com.ghsc.partybuild.vo.partyLife.PfDjscgzVo;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service("PfDjscgzService")
+public class PfDjscgzServiceImpl implements PfDjscgzService {
+    @Autowired
+    private PfDjscgzMapper PfDjscgzMapper;
+    @Autowired
+    private PfDjscgzCQuery PfDjscgzCQuery;
+    @Autowired
+    private StringUtils stringUtils;
+    @Autowired
+    private DictionaryService dictionaryService;
+
+    @Override
+    public PageInfo<PfDjscgzVo> getList(int pageIndex, int pageSize, String id, String dzzdm,
+                                        String pxqdsjks, String pxqdsjjs, String pxjgqdsjks, String pxjgqdsjjs,
+                                        String pxjb, String pxlb){
+        List<CfDictionary> pxjbTypeList = dictionaryService.getDictionaryListByDicTypeKey("pxjbType");
+        List<CfDictionary> pxlbTypeList = dictionaryService.getDictionaryListByDicTypeKey("pxlbType");
+
+        PageHelper.startPage(pageIndex, pageSize);
+        List<PfDjscgzVo> list = PfDjscgzCQuery.selectPfDjscgzList(id, dzzdm, pxqdsjks, pxqdsjjs, pxjgqdsjks, pxjgqdsjjs, pxjb, pxlb);
+
+        list.forEach(item->{
+            item.setPxjbtypename(dictionaryService.getDicByKey(item.getPxjb(), pxjbTypeList).getDicvalue());
+            item.setPxlbtypename(dictionaryService.getDicByKey(item.getPxlb(), pxlbTypeList).getDicvalue());
+        });
+
+        PageInfo<PfDjscgzVo> result = new PageInfo(list);
+        return result;
+    }
+
+    @Override
+    public PfDjscgzVo getPfDjscgzById(String id) {
+        if (stringUtils.IsNullOrEmpty(id))
+            return null;
+
+        List<PfDjscgzVo> list = getList(1,999999, id, null, null, null, null, null, null, null).getList();
+        return list.size() > 0 ? list.get(0) : null;
+    }
+
+    @Override
+    public int save(PfDjscgzVo data, String userId) {
+        int result = 0;
+        PfDjscgz dbModel = PfDjscgzMapper.selectByPrimaryKey(data.getId());
+        if (dbModel == null) {
+            dbModel = new PfDjscgz();
+            dbModel.setId(data.getId());
+            dbModel.setDzzdm(data.getDzzdm());
+            dbModel.setPxqdsj(data.getPxqdsj());
+            dbModel.setPxjgqdsj(data.getPxjgqdsj());
+            dbModel.setPxjb(data.getPxjb());
+            dbModel.setPxlb(data.getPxlb());
+            dbModel.setZygzbz(data.getZygzbz());
+            dbModel.setCreateTime(new Date());
+            dbModel.setCreateUserid(userId);
+            dbModel.setUpdateTime(new Date());
+            dbModel.setUpdateUserid(userId);
+
+            result = PfDjscgzMapper.insert(dbModel);
+        } else {
+            dbModel.setDzzdm(data.getDzzdm());
+            dbModel.setPxqdsj(data.getPxqdsj());
+            dbModel.setPxjgqdsj(data.getPxjgqdsj());
+            dbModel.setPxjb(data.getPxjb());
+            dbModel.setPxlb(data.getPxlb());
+            dbModel.setZygzbz(data.getZygzbz());
+            dbModel.setUpdateTime(new Date());
+            dbModel.setUpdateUserid(userId);
+
+            result = PfDjscgzMapper.updateByPrimaryKey(dbModel);
+        }
+        
+        return result;
+    }
+
+    @Override
+    public int delete(List<String> idList) {
+        PfDjscgzExample exp = new PfDjscgzExample();
+        exp.or().andIdIn(idList);
+
+        return PfDjscgzMapper.deleteByExample(exp);
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.ghsc.partybuild.service.partyLife;
+
+import com.ghsc.partybuild.vo.partyLife.PfDjscgzVo;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+public interface PfDjscgzService {
+    PageInfo<PfDjscgzVo> getList(int pageIndex, int pageSize, String id, String dzzdm,
+                                 String pxqdsjks, String pxqdsjjs, String pxjgqdsjks, String pxjgqdsjjs,
+                                 String pxjb, String pxlb);
+
+    PfDjscgzVo getPfDjscgzById(String id);
+
+    int save(PfDjscgzVo data, String userId);
+
+    int delete(List<String> idList);
+}

src/main/java/com/ghsc/partybuild/vo/partyLife/PfDjscgzVo.java

@@ -0,0 +1,13 @@
+package com.ghsc.partybuild.vo.partyLife;
+
+import com.ghsc.partybuild.model.PfDjscgz;
+import lombok.Data;
+
+
+@Data
+public class PfDjscgzVo extends PfDjscgz {
+    private String dzzmc;
+    private String createusername;
+    private String pxjbtypename;
+    private String pxlbtypename;
+}

src/main/resources/generatorConfig.xml

@@ -278,6 +278,7 @@
         <table schema="" tableName="pt_reportData"></table>
         <table schema="" tableName="pt_reportScore"></table>
         <table schema="" tableName="pf_dnjzjy"></table>
+        <table schema="" tableName="pf_djscgz"></table>
 
         -->
     </context>

src/main/resources/mapping/PfDjscgzCQuery.xml

@@ -0,0 +1,53 @@
+<?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.PfDjscgzCQuery">
+    <resultMap id="BaseResultMap" type="com.ghsc.partybuild.vo.partyLife.PfDjscgzVo">
+        <id column="id" jdbcType="VARCHAR" property="id" />
+        <result column="dzzdm" jdbcType="VARCHAR" property="dzzdm" />
+        <result column="pxqdsj" jdbcType="VARCHAR" property="pxqdsj" />
+        <result column="pxjgqdsj" jdbcType="VARCHAR" property="pxjgqdsj" />
+        <result column="pxjb" jdbcType="VARCHAR" property="pxjb" />
+        <result column="pxlb" jdbcType="VARCHAR" property="pxlb" />
+        <result column="zygzbz" jdbcType="VARCHAR" property="zygzbz" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_userid" jdbcType="VARCHAR" property="createUserid" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_userid" jdbcType="VARCHAR" property="updateUserid" />
+        <result column="dzzmc" jdbcType="VARCHAR" property="dzzmc" />
+        <result column="username" jdbcType="VARCHAR" property="createusername" />
+    </resultMap>
+    <select id="selectPfDjscgzList" resultMap="BaseResultMap">
+        select pd.id, pd.dzzdm, pd.pxqdsj, pd.pxjgqdsj, pd.pxjb, pd.pxlb, pd.zygzbz,
+        pd.create_time, pd.create_userid, pd.update_time, pd.update_userid,
+        zz.dzzmc,cu.USERNAME
+        from pf_djscgz pd
+        left join zz_zzqkxx zz on pd.dzzdm = zz.DZZDM
+        left join cf_users cu on pd.create_userid = cu.USERID
+        where 1=1
+        <if test="id != null and id != ''">
+            and pd.id = #{id}
+        </if>
+        <if test="dzzdm != null and dzzdm != ''">
+            and pd.dzzdm like concat('%',#{dzzdm},'%')
+        </if>
+        <if test="pxqdsjks!=null and pxqdsjks!=''">
+            and pd.pxqdsj <![CDATA[ >= ]]> #{pxqdsjks}
+        </if>
+        <if test="pxqdsjjs!=null and pxqdsjjs!=''">
+            and pd.pxqdsj <![CDATA[ <= ]]> #{pxqdsjjs}
+        </if>
+        <if test="pxjgqdsjks!=null and pxjgqdsjks!=''">
+            and pd.pxjgqdsj <![CDATA[ >= ]]> #{pxjgqdsjks}
+        </if>
+        <if test="pxjgqdsjjs!=null and pxjgqdsjjs!=''">
+            and pd.pxjgqdsj <![CDATA[ <= ]]> #{pxjgqdsjjs}
+        </if>
+        <if test="pxjb != null and pxjb != ''">
+            and pd.pxjb = #{pxjb}
+        </if>
+        <if test="pxlb != null and pxlb != ''">
+            and pd.pxlb = #{pxlb}
+        </if>
+        order by pd.create_time desc
+    </select>
+</mapper>

src/main/resources/mapping/PfDjscgzMapper.xml

@@ -0,0 +1,306 @@
+<?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.PfDjscgzMapper">
+  <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.PfDjscgz">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="dzzdm" jdbcType="VARCHAR" property="dzzdm" />
+    <result column="pxqdsj" jdbcType="VARCHAR" property="pxqdsj" />
+    <result column="pxjgqdsj" jdbcType="VARCHAR" property="pxjgqdsj" />
+    <result column="pxjb" jdbcType="INTEGER" property="pxjb" />
+    <result column="pxlb" jdbcType="INTEGER" property="pxlb" />
+    <result column="zygzbz" jdbcType="VARCHAR" property="zygzbz" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_userid" jdbcType="VARCHAR" property="createUserid" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_userid" 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, dzzdm, pxqdsj, pxjgqdsj, pxjb, pxlb, zygzbz, create_time, create_userid, update_time, 
+    update_userid
+  </sql>
+  <select id="selectByExample" parameterType="com.ghsc.partybuild.model.PfDjscgzExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pf_djscgz
+    <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_djscgz
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pf_djscgz
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.PfDjscgzExample">
+    delete from pf_djscgz
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ghsc.partybuild.model.PfDjscgz">
+    insert into pf_djscgz (id, dzzdm, pxqdsj, 
+      pxjgqdsj, pxjb, pxlb, 
+      zygzbz, create_time, create_userid, 
+      update_time, update_userid)
+    values (#{id,jdbcType=VARCHAR}, #{dzzdm,jdbcType=VARCHAR}, #{pxqdsj,jdbcType=VARCHAR}, 
+      #{pxjgqdsj,jdbcType=VARCHAR}, #{pxjb,jdbcType=INTEGER}, #{pxlb,jdbcType=INTEGER}, 
+      #{zygzbz,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateUserid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.PfDjscgz">
+    insert into pf_djscgz
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="dzzdm != null">
+        dzzdm,
+      </if>
+      <if test="pxqdsj != null">
+        pxqdsj,
+      </if>
+      <if test="pxjgqdsj != null">
+        pxjgqdsj,
+      </if>
+      <if test="pxjb != null">
+        pxjb,
+      </if>
+      <if test="pxlb != null">
+        pxlb,
+      </if>
+      <if test="zygzbz != null">
+        zygzbz,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createUserid != null">
+        create_userid,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="updateUserid != null">
+        update_userid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="dzzdm != null">
+        #{dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="pxqdsj != null">
+        #{pxqdsj,jdbcType=VARCHAR},
+      </if>
+      <if test="pxjgqdsj != null">
+        #{pxjgqdsj,jdbcType=VARCHAR},
+      </if>
+      <if test="pxjb != null">
+        #{pxjb,jdbcType=INTEGER},
+      </if>
+      <if test="pxlb != null">
+        #{pxlb,jdbcType=INTEGER},
+      </if>
+      <if test="zygzbz != null">
+        #{zygzbz,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.PfDjscgzExample" resultType="java.lang.Long">
+    select count(*) from pf_djscgz
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pf_djscgz
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dzzdm != null">
+        dzzdm = #{record.dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pxqdsj != null">
+        pxqdsj = #{record.pxqdsj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pxjgqdsj != null">
+        pxjgqdsj = #{record.pxjgqdsj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pxjb != null">
+        pxjb = #{record.pxjb,jdbcType=INTEGER},
+      </if>
+      <if test="record.pxlb != null">
+        pxlb = #{record.pxlb,jdbcType=INTEGER},
+      </if>
+      <if test="record.zygzbz != null">
+        zygzbz = #{record.zygzbz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createUserid != null">
+        create_userid = #{record.createUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUserid != null">
+        update_userid = #{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_djscgz
+    set id = #{record.id,jdbcType=VARCHAR},
+      dzzdm = #{record.dzzdm,jdbcType=VARCHAR},
+      pxqdsj = #{record.pxqdsj,jdbcType=VARCHAR},
+      pxjgqdsj = #{record.pxjgqdsj,jdbcType=VARCHAR},
+      pxjb = #{record.pxjb,jdbcType=INTEGER},
+      pxlb = #{record.pxlb,jdbcType=INTEGER},
+      zygzbz = #{record.zygzbz,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_userid = #{record.createUserid,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_userid = #{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.PfDjscgz">
+    update pf_djscgz
+    <set>
+      <if test="dzzdm != null">
+        dzzdm = #{dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="pxqdsj != null">
+        pxqdsj = #{pxqdsj,jdbcType=VARCHAR},
+      </if>
+      <if test="pxjgqdsj != null">
+        pxjgqdsj = #{pxjgqdsj,jdbcType=VARCHAR},
+      </if>
+      <if test="pxjb != null">
+        pxjb = #{pxjb,jdbcType=INTEGER},
+      </if>
+      <if test="pxlb != null">
+        pxlb = #{pxlb,jdbcType=INTEGER},
+      </if>
+      <if test="zygzbz != null">
+        zygzbz = #{zygzbz,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUserid != null">
+        create_userid = #{createUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUserid != null">
+        update_userid = #{updateUserid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ghsc.partybuild.model.PfDjscgz">
+    update pf_djscgz
+    set dzzdm = #{dzzdm,jdbcType=VARCHAR},
+      pxqdsj = #{pxqdsj,jdbcType=VARCHAR},
+      pxjgqdsj = #{pxjgqdsj,jdbcType=VARCHAR},
+      pxjb = #{pxjb,jdbcType=INTEGER},
+      pxlb = #{pxlb,jdbcType=INTEGER},
+      zygzbz = #{zygzbz,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_userid = #{createUserid,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_userid = #{updateUserid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -3251,6 +3251,42 @@
                     return $ocLazyLoad.load('../main/partylife/dnjzjy/detail.js?' + window.sysVersion);
                 }]
             }	
+		 }).state("home.pf_djscgzList", {
+            url: "pf_djscgzList",
+            templateUrl: "../main/partylife/djscgz/list.html?" + window.sysVersion,
+            controller: "pf_djscgzListCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/djscgz/list.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_djscgzEdit", {
+            url: "pf_djscgzEdit",
+            templateUrl: "../main/partylife/djscgz/edit.html?" + window.sysVersion,
+            controller: "pf_djscgzEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/djscgz/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_djscgzAdd", {
+            url: "pf_djscgzAdd",
+            templateUrl: "../main/partylife/djscgz/edit.html?" + window.sysVersion,
+            controller: "pf_djscgzEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/djscgz/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_djscgzDetail", {
+            url: "pf_djscgzDetail",
+            templateUrl: "../main/partylife/djscgz/detail.html?" + window.sysVersion,
+            controller: "pf_djscgzDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/djscgz/detail.js?' + window.sysVersion);
+                }]
+            }
         }).state("register", {
             url: "/register",
             templateUrl: "../main/partyUser/admit/register/edit.html?" + window.sysVersion,

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

@@ -0,0 +1,33 @@
+<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.dzzmc}}</td>
+                            <th>评选级别</th>
+                            <td>{{dataModel.pxjbtypename}}</td>
+                            <th>评选类别</th>
+                            <td>{{dataModel.pxlbtypename}}</td>
+                        </tr>
+                        <tr>
+                            <th>评选启动时间</th>
+                            <td>{{dataModel.pxqdsj | date:'yyyy-MM-dd'}}</td>
+                            <th>评选结果确定时间</th>
+                            <td>{{dataModel.pxjgqdsj | date:'yyyy-MM-dd'}}</td>
+                            <td colspan="2"></td>
+                        </tr>
+                        <tr>
+                            <th>主要工作步骤</th>
+                            <td colspan="5">
+                                {{dataModel.zygzbz}}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            <bsfiles ng-model="reqFileModel"/>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,37 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_djscgzDetailCtrl', 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.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/partylife/djscgz/get",
+                params: {
+                    'id': $scope.editParams.id
+                }
+            }).then(function (result) {
+                $scope.dataModel = result.data.item;
+                $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.id;
+            }, function (resp) {
+                $scope.showMsg('错误', '服务器错误：' + resp.data);
+            });
+        };
+
+        $scope.getData();
+
+        $scope.reqFileModel = {
+            selectdata: {FileRefID: '', pageindex: 1, pagesize: 10, ptotal: 0},//查询参数：FileRefID为文件关联ID
+            filetype: 71,//文件类型
+            items: [],//列表数据地址
+            readonly: true,//是否只能查看
+            title: '附件',
+            addFileButton: '上传'
+        };
+
+        $scope.pagechange = function () {
+            $bsRouterState.$closeTab($scope);
+        };
+    });
+})(angular);

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

@@ -0,0 +1,83 @@
+<titlemenu></titlemenu>
+<div class="dj-card">
+    <div class="dj-body" activate-input activate-select>
+        <div class="card">
+                <form class="form-horizontal" role="form" id="editForm"
+                      name="editForm" ng-submit="save(editForm.$valid)" novalidate>
+                    <div class="dj-formtable">
+                        <table class="dj-table dj-table3">
+                            <tr>
+                                <th>党组织（工作室）名称<span style="color:red;">*</span></th>
+                                <td>
+                                    <div class="input-group input-group-search"
+                                         title="选择党组织" ng-click="selectParty()">
+                                        <input name="dzzmc" type="text" ng-model="dataModel.dzzmc"
+                                               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.dzzmc.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>评选级别<span style="color:red;">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.pxjb.$invalid &&  this.editForm.$submitted}">
+                                    <select name="pxjb" ng-model="dataModel.pxjb" class="form-control"
+                                            ng-options="type.dickey as type.dicvalue for type in pxjbTypeList"
+                                            ng-required="true">
+                                        <option value="">--全部--</option>
+                                    </select>
+                                    <span ng-show="this.editForm.pxjb.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>评选类别<span style="color:red;">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.pxlb.$invalid &&  this.editForm.$submitted}">
+                                    <select name="pxlb" ng-model="dataModel.pxlb" class="form-control"
+                                            ng-options="type.dickey as type.dicvalue for type in pxlbTypeList"
+                                            ng-required="true">
+                                        <option value="">--全部--</option>
+                                    </select>
+                                    <span ng-show="this.editForm.pxlb.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>评选启动时间<span style="color:red;">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.pxqdsj.$invalid &&  this.editForm.$submitted}">
+                                    <input name="pxqdsj" class="form-control fm-ct-first"
+                                           autocomplete="off" autoclose="true"
+                                           data-date-format="yyyy-MM-dd" data-date-type="string"
+                                           ng-model="dataModel.pxqdsj"
+                                           placeholder="" bs-datepicker ng-required="true"/>
+                                    <span ng-show="this.editForm.pxqdsj.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <th>评选结果确定时间<span style="color:red;">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.pxjgqdsj.$invalid &&  this.editForm.$submitted}">
+                                    <input name="pxjgqdsj" class="form-control fm-ct-first"
+                                           autocomplete="off" autoclose="true"
+                                           data-date-format="yyyy-MM-dd" data-date-type="string"
+                                           ng-model="dataModel.pxjgqdsj"
+                                           placeholder="" bs-datepicker ng-required="true"/>
+                                    <span ng-show="this.editForm.pxjgqdsj.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                                <td colspan="2"></td>
+                            </tr>
+                            <tr>
+                                <th style="width: 5%;">主要工作步骤</th>
+                                <td colspan="5">
+                                   <textarea name="zygzbz" ng-model="dataModel.zygzbz"
+                                             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="pagechange()">取消</button>
+                        <button type="submit" class="btn btn-primary" form="editForm">保存</button>
+                    </div>
+                </form>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,119 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_djscgzEditCtrl', 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.pxjbTypeList = [];
+        $scope.pxlbTypeList = [];
+
+        $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.dzzdm = $scope.partyConfig.selectedKey;
+                $scope.dataModel.dzzmc = $scope.partyConfig.selectedText;
+
+                $scope.partyConfig.selectedText = "";
+                $scope.partyConfig.selectedKey = "";
+            }
+        }, true);
+        $scope.selectParty = function () {
+            $partySelect.showModal();
+        };
+
+        $scope.loadPxjbTypes=function(){
+
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {dicTypeKey: 'pxjbType'}
+            }).then(function (result) {
+                $scope.pxjbTypeList = result.data;
+            }, function (resp) {
+
+            });
+        };
+
+        $scope.loadPxlbTypes=function(){
+
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {dicTypeKey: 'pxlbType'}
+            }).then(function (result) {
+                $scope.pxlbTypeList = result.data;
+            }, function (resp) {
+
+            });
+        };
+
+        $scope.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/partylife/djscgz/get",
+                params: {
+                    'id': $scope.editParams.id
+                }
+            }).then(function (result) {
+                $scope.dataModel = result.data.item;
+                $scope.reqFileModel.selectdata.FileRefID = $scope.dataModel.id;
+                if(!$scope.dataModel.dzzdm){
+                    $scope.dataModel.dzzdm = AuthUser.getUser().DPCode;
+                    $scope.dataModel.dzzmc = AuthUser.getUser().DPName;
+                }
+                $scope.loadPxjbTypes();
+                $scope.loadPxlbTypes();
+            }, function (resp) {
+                $scope.showMsg('错误', '服务器错误：' + resp.data);
+            });
+        };
+
+        $scope.save = function (isflag) {
+            if (isflag) {
+
+                $loading.show();
+                $http({
+                    method: "post",
+                    url: "../../api/partylife/djscgz/save",
+                    data: $scope.dataModel
+                }).then(function (result) {
+                    $loading.hide();
+                    if (result.data.success) {
+                        $scope.showMsg('成功', "操作成功");
+                        $scope.pagechange();
+                        //重新刷新列表
+                        $scope.$emit("tabReloadData", {name: 'pf_djscgzListCtrl', data: 1});
+                    } else {
+                        $scope.showMsg('失败', result.data.msg);
+                    }
+                }, function (resp) {
+                    $loading.hide();
+                    $scope.showMsg('错误', '服务器错误：' + resp.data);
+                });
+            }
+        };
+
+        $scope.pagechange = function () {
+            $bsRouterState.$closeTab($scope);
+        };
+
+        $scope.getData();
+    });
+})(angular);

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

@@ -0,0 +1,225 @@
+<titlemenu></titlemenu>
+<div class="dj-list">
+    <div class="dj-list-body">
+        <div party-tree data-selectdzzdm="treeparams.selectdzzdm" data-selectdzzmc="treeparams.selectdzzmc"
+             data-defaultselected="treeparams.defaultselected" data-isunfold="treeparams.isunfold"></div>
+        <div class="dj-list-content">
+            <div class="card">
+                <div activate-input activate-select class="header search-header">
+                    <div fold-partytree data-isunfold="treeparams.isunfold"></div>
+                    <div class="search-param-panel">
+                        <div class="search-input">
+                            <form class="form-horizontal">
+                                <div class="row clearfix form-inline">
+                                    <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">
+                                                <div class="input-group input-group-search">
+                                                    <input name="selectdzzmc" type="text" style="min-width: 90px"
+                                                           ng-model="treeparams.selectdzzmc" class="form-control"
+                                                           ng-disabled="true"/>
+                                                    <span class="input-group-addon"
+                                                          ng-click="setisunfold()">选择</span>
+                                                </div>
+                                            </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="pxqdsjks" class="form-control fm-ct-first"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.pxqdsjks"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                                <input name="pxqdsjjs" class="form-control fm-ct-last"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.pxqdsjjs"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
+                                        <label>评选级别</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <select style="height: 100%;" name="pxjb"
+                                                        ng-model="selectparams.pxjb" class="form-control"
+                                                        ng-change="search()"
+                                                        ng-options="type.dickey as type.dicvalue for type in pxjbTypeList">
+                                                    <option value="">--全部--</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row clearfix form-inline" ng-show="isShow">
+                                    <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="pxjgqdsjks" class="form-control fm-ct-first"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.pxjgqdsjks"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                                <input name="pxjgqdsjjs" class="form-control fm-ct-last"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.pxjgqdsjjs"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 dj-label">
+                                        <label>评选类别({{selectparams.pxlb}})</label>
+                                    </div>
+                                    <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+                                        <div class="form-group">
+                                            <div class="form-line">
+                                                <select style="height: 100%;" name="pxlb"
+                                                        ng-model="selectparams.pxlb" class="form-control"
+                                                        ng-change="search()"
+                                                        ng-options="type.dickey as type.dicvalue for type in pxlbTypeList">
+                                                    <option value="">--全部--</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                        <div class="search-btn" style="margin-right: 20px;">
+                            <div style="min-width: 13em">
+                                <span class="moreSpan" ng-click="isShowClick()" style='padding-right:1em;cursor:pointer;'>
+                                    {{moreTxt}}<i class="material-icons" style="position: relative;top:7px;">{{isShow ? 'expand_less' : 'expand_more'}}</i></span>
+                                <button class="btn btn-default1"
+                                        ng-click="search()">查询
+                                </button>
+                                <button class="btn btn-default1"
+                                        ng-click="reset()">重置
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="search-btn" style="margin-right: 20px;">
+                        <div style="float: right">
+                            <button class="btn btn-default1"
+                                    ng-click="add()">新增
+                            </button>
+                            <button class="btn btn-default1"
+                                    ng-click="delete()">删除
+                            </button>
+                            <button class="btn btn-default1"
+                                    ng-click="export()">导出
+                            </button>
+                        </div>
+                    </div>
+                </div>
+                <div class="body">
+                    <div class="zero-list-table-panel">
+                        <div class="zero-source-table-div">
+                            <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>
+                                </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.dzzmc}}</td>
+                                    <td>{{it.pxqdsj | date:'yyyy-MM-dd'}}</td>
+                                    <td>{{it.pxjgqdsj | date:'yyyy-MM-dd'}}</td>
+                                    <td>{{it.pxjbtypename}}</td>
+                                    <td>{{it.pxlbtypename}}</td>
+                                    <td style="min-width: 150px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.zygzbz}}</td>
+                                    <td>{{it.createusername}}</td>
+                                    <td>{{it.createTime | date:'yyyy-MM-dd'}}</td>
+                                </tr>
+                                <tr ng-if="dataList.length<=0">
+                                    <td colspan="15" style="text-align:center">暂无数据</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="zero-target-table-div">
+                            <table class="table table-bordered table-striped table-hover js-basic-example dataTable text-nowrap">
+                                <thead>
+                                <tr>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr ng-repeat="it in dataList" zero-table-height>
+                                    <td>
+                                        <button class="btn td-btn bg-light-green waves-effect"
+                                                ng-click="show(it.id)"
+                                                title="查看">
+                                            查看
+                                        </button>
+                                        <button
+                                                role-permission-code="brandMgList.btnEdit"
+                                                class="btn td-btn bg-light-green waves-effect"
+                                                ng-click="edit(it.id)"
+                                                title="修改">
+                                            修改
+                                        </button>
+                                    </td>
+                                </tr>
+                                <tr ng-if="pageInfo.ptotal==0">
+                                    <td colspan="1" style="text-align:center">无</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    <pagination data-pageindex="selectparams.pageindex" data-pagesize="selectparams.pagesize"
+                                data-ptotal="pageInfo.ptotal"></pagination>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,203 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_djscgzListCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.loginUserId = AuthUser.getUser().Id;
+        $scope.isShow = true;
+        $scope.moreTxt = "更多";
+        $scope.isAll = false;
+        $scope.tabNameAdd = "home.pf_djscgzAdd";
+        $scope.tabNameEdit = "home.pf_djscgzEdit";
+        $scope.tabNameDetail = "home.pf_djscgzDetail";
+
+        //定义数据集合
+        $scope.dataList = []; //列表数据
+        $scope.pxjbTypeList = [];
+        $scope.pxlbTypeList = [];
+        //组织树参数
+        $scope.treeparams = {
+            isunfold: false,//组织结构树展开收缩
+            selectdzzdm: "",
+            selectdzzmc: "",
+            defaultselected: ''
+        };
+        $scope.resetTreeparams = angular.copy($scope.treeparams);
+
+        //查询条件
+        $scope.selectparams = {
+            pageindex: 1,
+            pagesize: 10,
+            dzzdm: '',
+            pxqdsjks: null,
+            pxqdsjjs: null,
+            pxjb: null,
+            pxjgqdsjks: null,
+            pxjgqdsjjs: null,
+            pxlb: null
+        };
+        $scope.resetSelectparams = angular.copy($scope.selectparams);
+        $scope.pageInfo = {ptotal: 0};
+
+        $scope.$on('tabChildReloadData', function (event, data) {
+            if (data.name == 'pf_djscgzListCtrl') {
+                $scope.loadData();
+            }
+        });
+
+        $scope.loadPxjbTypes=function(){
+
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {dicTypeKey: 'pxjbType'}
+            }).then(function (result) {
+                $scope.pxjbTypeList = result.data;
+            }, function (resp) {
+
+            });
+        };
+        $scope.loadPxjbTypes();
+
+        $scope.loadPxlbTypes=function(){
+
+            $http({
+                method: 'get',
+                url: '../../api/dictionary/getDictionaryListByDicTypeKey',
+                params: {dicTypeKey: 'pxlbType'}
+            }).then(function (result) {
+                $scope.pxlbTypeList = result.data;
+            }, function (resp) {
+
+            });
+        };
+        $scope.loadPxlbTypes();
+
+        //加载列表数据
+        $scope.loadData = function () {
+            $http
+            ({
+                method: 'get', url: '../../api/partylife/djscgz/getList', params: $scope.selectparams
+            }).then(function (result) {
+                $scope.dataList = result.data.item.list;
+                $scope.pageInfo.ptotal = result.data.item.total;
+            }, function (res) {
+                $scope.showMsg('错误', '服务器错误');
+            });
+        };
+
+        $scope.search = function () {
+            $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) {
+            $bsRouterState.$closeTabName($scope.tabNameEdit);
+            $timeout(function () {
+                $bsRouterState.go($scope.tabNameEdit, {
+                    id: id
+                });
+            }, 100);
+        };
+
+        $scope.export = function () {
+            var params = "?1=1";
+            for (var p in $scope.selectparams) {
+                if ($scope.selectparams[p] !== '' && $scope.selectparams[p] !== null)
+                    params += ("&" + p + "=" + encodeURI($scope.selectparams[p]));
+            }
+            window.open('../../api/partylife/djscgz/export' + params);
+        };
+
+        $scope.delete = function (id) {
+            var ids = [];
+            if (id)
+                ids.push(id);
+            else
+                ids = $scope.dataList.filter(it => it.checked == true).map(it => it.id);
+
+            if (ids.length == 0) {
+                $scope.showMsg('消息', "请选择需要删除的数据");
+                return false;
+            }
+
+            if (confirm("确定删除？")) {
+                $loading.show();
+                $http({
+                    method: "post",
+                    url: "../../api/partylife/djscgz/delete",
+                    data: {
+                        ids: JSON.stringify(ids)
+                    }
+                }).then(function (result) {
+                    $loading.hide();
+                    if (result.data.success) {
+                        $scope.showMsg('成功', result.data.msg);
+                        //重新刷新列表
+                        $scope.loadData();
+                    } else {
+                        $scope.showMsg('失败', result.data.msg);
+                    }
+                }, function (resp) {
+                    $scope.showMsg('错误', '服务器错误');
+                });
+            }
+        };
+
+        $scope.$watch("selectparams.pageindex", function (newVal, oldVal) {
+            if ($scope.pageInfo.ptotal > 0) {
+                $scope.loadData();
+            }
+        });
+        $scope.$watch("treeparams.selectdzzdm", function (newVal, oldVal) {
+            if (newVal != "") {
+                if ($scope.treeparams.defaultselected != "" && $scope.treeparams.defaultselected != null &&
+                    $scope.treeparams.defaultselected != $scope.treeparams.selectdzzdm)
+                    return;
+
+                $scope.selectparams.dzzdm = $scope.treeparams.selectdzzdm;
+
+                $scope.loadData();
+            }
+        });
+        $scope.setisunfold = function () {
+            $scope.treeparams.isunfold = !$scope.treeparams.isunfold;
+            $scope.$emit('menudatas.toggle', !$scope.treeparams.isunfold);
+        };
+        $scope.isShowClick = function () {
+            $scope.isShow = !$scope.isShow;
+            $scope.moreTxt = $scope.isShow ? "收起" : "更多";
+        };
+        $scope.reset = function () {
+            $scope.selectparams = angular.copy($scope.resetSelectparams);
+            $scope.treeparams = angular.copy($scope.resetTreeparams);
+            $scope.loadData();
+        };
+
+        $scope.loadData();
+    });
+})(angular);

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

@@ -69,8 +69,6 @@
                         </div>
                         <div class="search-btn" style="margin-right: 20px;">
                             <div style="min-width: 13em">
-                                <span class="moreSpan" ng-click="isShowClick()" style='padding-right:1em;cursor:pointer;'>
-                                    {{moreTxt}}<i class="material-icons" style="position: relative;top:7px;">{{isShow ? 'expand_less' : 'expand_more'}}</i></span>
                                 <button class="btn btn-default1"
                                         ng-click="search()">查询
                                 </button>

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

@@ -23,13 +23,10 @@
         $scope.selectparams = {
             pageindex: 1,
             pagesize: 10,
-            partyLifeMeetingType: $scope.partyLifeMeetingType,
             dzzdm: '',
             startDate: null,
             endDate: null,
-            zt: '',
-            dx: '',
-            sx: ''
+            zt: ''
         };
         $scope.resetSelectparams = angular.copy($scope.selectparams);
         $scope.pageInfo = {ptotal: 0};