组织生活-专题建设-党内集中教育

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

@@ -0,0 +1,183 @@
+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.PfDnjzjyService;
+import com.ghsc.partybuild.util.DateUtils;
+import com.ghsc.partybuild.util.ExcelHelper;
+import com.ghsc.partybuild.util.JsonMapper;
+import com.ghsc.partybuild.vo.partyLife.PfDnjzjyVo;
+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/dnjzjy")
+public class PfDnjzjyController {
+    @Autowired
+    private PfDnjzjyService pfDnjzjyService;
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private DateUtils dateUtils;
+    private static final String dateTimeFormat = "yyyy-MM-dd";
+
+    @ResponseBody
+    @GetMapping("/getList")
+    public RequsetData<PageInfo<PfDnjzjyVo>> getList(int pageindex, int pagesize, @RequestParam(required = false) String dzzdm, 
+                                                             @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date startDate, 
+                                                             @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date endDate,
+                                                             @RequestParam(required = false) String zt) {
+        RequsetData<PageInfo<PfDnjzjyVo>> result = new RequsetData<>();
+        result.setItem(pfDnjzjyService.getList(pageindex, pagesize, null, dzzdm, startDate, endDate, zt));
+        return result;
+    }
+
+    @ResponseBody
+    @GetMapping("/get")
+    public RequsetData<PfDnjzjyVo> get(@RequestParam(required = false) String id) {
+        RequsetData<PfDnjzjyVo> res = new RequsetData<>();
+
+        PfDnjzjyVo model = pfDnjzjyService.getPfDnjzjyById(id);
+        if (model == null) {
+            model = new PfDnjzjyVo();
+            model.setId(UUID.randomUUID().toString());
+        }
+
+        res.setItem(model);
+        return res;
+    }
+
+    @ResponseBody
+    @PostMapping("/save")
+    public RequsetData<String> save(@RequestBody PfDnjzjyVo data) {
+        RequsetData<String> result = new RequsetData<String>();
+        int count = 0;
+        String message = "";
+
+        try {
+            count = pfDnjzjyService.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 = pfDnjzjyService.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) @DateTimeFormat(pattern = dateTimeFormat) Date startDate,
+                                 @RequestParam(required = false) @DateTimeFormat(pattern = dateTimeFormat) Date endDate,
+                                 @RequestParam(required = false) String zt) throws Exception {
+        /**查询数据**/
+        List<PfDnjzjyVo> dataList = pfDnjzjyService.getList(1, 100000, null, dzzdm, startDate, endDate, zt).getList();
+
+        ExcelHelper excelHelper = new ExcelHelper();
+        ExcelHelper.ExcelData data = excelHelper.new ExcelData();
+
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFSheet sheet = wb.createSheet("党内集中教育");
+        sheet.setColumnWidth(1, 256 * 20);
+        sheet.setColumnWidth(2, 256 * 20);
+        sheet.setColumnWidth(3, 256 * 30);
+        sheet.setColumnWidth(4, 256 * 50);
+        sheet.setColumnWidth(5, 256 * 50);
+        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 (PfDnjzjyVo item : dataList) {
+                List<Object> row = new ArrayList();
+                row.add(++i);
+                row.add(item.getJykssj());
+                row.add(item.getJyjssj());
+                row.add(item.getDzzmc());
+                row.add(item.getZt());
+                row.add(item.getZygzbz());
+                row.add(item.getQddcx());
+                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/PfDnjzjyCQuery.java

@@ -0,0 +1,13 @@
+package com.ghsc.partybuild.mapper;
+
+import com.ghsc.partybuild.vo.partyLife.PfDnjzjyVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface PfDnjzjyCQuery {
+    List<PfDnjzjyVo> selectPfDnjzjyList(@Param("id") String id, @Param("dzzdm") String dzzdm, @Param("startDate") Date startDate,
+                                        @Param("endDate") Date endDate, @Param("zt") String zt);
+
+}

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

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

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

@@ -0,0 +1,115 @@
+package com.ghsc.partybuild.model;
+
+import java.util.Date;
+
+public class PfDnjzjy {
+    private String id;
+
+    private String dzzdm;
+
+    private String jykssj;
+
+    private String jyjssj;
+
+    private String zt;
+
+    private String zygzbz;
+
+    private String qddcx;
+
+    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 getJykssj() {
+        return jykssj;
+    }
+
+    public void setJykssj(String jykssj) {
+        this.jykssj = jykssj == null ? null : jykssj.trim();
+    }
+
+    public String getJyjssj() {
+        return jyjssj;
+    }
+
+    public void setJyjssj(String jyjssj) {
+        this.jyjssj = jyjssj == null ? null : jyjssj.trim();
+    }
+
+    public String getZt() {
+        return zt;
+    }
+
+    public void setZt(String zt) {
+        this.zt = zt == null ? null : zt.trim();
+    }
+
+    public String getZygzbz() {
+        return zygzbz;
+    }
+
+    public void setZygzbz(String zygzbz) {
+        this.zygzbz = zygzbz == null ? null : zygzbz.trim();
+    }
+
+    public String getQddcx() {
+        return qddcx;
+    }
+
+    public void setQddcx(String qddcx) {
+        this.qddcx = qddcx == null ? null : qddcx.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/PfDnjzjyExample.java

@@ -0,0 +1,951 @@
+package com.ghsc.partybuild.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class PfDnjzjyExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PfDnjzjyExample() {
+        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 andJykssjIsNull() {
+            addCriterion("jykssj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjIsNotNull() {
+            addCriterion("jykssj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjEqualTo(String value) {
+            addCriterion("jykssj =", value, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjNotEqualTo(String value) {
+            addCriterion("jykssj <>", value, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjGreaterThan(String value) {
+            addCriterion("jykssj >", value, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjGreaterThanOrEqualTo(String value) {
+            addCriterion("jykssj >=", value, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjLessThan(String value) {
+            addCriterion("jykssj <", value, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjLessThanOrEqualTo(String value) {
+            addCriterion("jykssj <=", value, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjLike(String value) {
+            addCriterion("jykssj like", value, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjNotLike(String value) {
+            addCriterion("jykssj not like", value, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjIn(List<String> values) {
+            addCriterion("jykssj in", values, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjNotIn(List<String> values) {
+            addCriterion("jykssj not in", values, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjBetween(String value1, String value2) {
+            addCriterion("jykssj between", value1, value2, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJykssjNotBetween(String value1, String value2) {
+            addCriterion("jykssj not between", value1, value2, "jykssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjIsNull() {
+            addCriterion("jyjssj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjIsNotNull() {
+            addCriterion("jyjssj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjEqualTo(String value) {
+            addCriterion("jyjssj =", value, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjNotEqualTo(String value) {
+            addCriterion("jyjssj <>", value, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjGreaterThan(String value) {
+            addCriterion("jyjssj >", value, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjGreaterThanOrEqualTo(String value) {
+            addCriterion("jyjssj >=", value, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjLessThan(String value) {
+            addCriterion("jyjssj <", value, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjLessThanOrEqualTo(String value) {
+            addCriterion("jyjssj <=", value, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjLike(String value) {
+            addCriterion("jyjssj like", value, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjNotLike(String value) {
+            addCriterion("jyjssj not like", value, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjIn(List<String> values) {
+            addCriterion("jyjssj in", values, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjNotIn(List<String> values) {
+            addCriterion("jyjssj not in", values, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjBetween(String value1, String value2) {
+            addCriterion("jyjssj between", value1, value2, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJyjssjNotBetween(String value1, String value2) {
+            addCriterion("jyjssj not between", value1, value2, "jyjssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtIsNull() {
+            addCriterion("zt is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtIsNotNull() {
+            addCriterion("zt is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtEqualTo(String value) {
+            addCriterion("zt =", value, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtNotEqualTo(String value) {
+            addCriterion("zt <>", value, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtGreaterThan(String value) {
+            addCriterion("zt >", value, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtGreaterThanOrEqualTo(String value) {
+            addCriterion("zt >=", value, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtLessThan(String value) {
+            addCriterion("zt <", value, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtLessThanOrEqualTo(String value) {
+            addCriterion("zt <=", value, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtLike(String value) {
+            addCriterion("zt like", value, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtNotLike(String value) {
+            addCriterion("zt not like", value, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtIn(List<String> values) {
+            addCriterion("zt in", values, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtNotIn(List<String> values) {
+            addCriterion("zt not in", values, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtBetween(String value1, String value2) {
+            addCriterion("zt between", value1, value2, "zt");
+            return (Criteria) this;
+        }
+
+        public Criteria andZtNotBetween(String value1, String value2) {
+            addCriterion("zt not between", value1, value2, "zt");
+            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 andQddcxIsNull() {
+            addCriterion("qddcx is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxIsNotNull() {
+            addCriterion("qddcx is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxEqualTo(String value) {
+            addCriterion("qddcx =", value, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxNotEqualTo(String value) {
+            addCriterion("qddcx <>", value, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxGreaterThan(String value) {
+            addCriterion("qddcx >", value, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxGreaterThanOrEqualTo(String value) {
+            addCriterion("qddcx >=", value, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxLessThan(String value) {
+            addCriterion("qddcx <", value, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxLessThanOrEqualTo(String value) {
+            addCriterion("qddcx <=", value, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxLike(String value) {
+            addCriterion("qddcx like", value, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxNotLike(String value) {
+            addCriterion("qddcx not like", value, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxIn(List<String> values) {
+            addCriterion("qddcx in", values, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxNotIn(List<String> values) {
+            addCriterion("qddcx not in", values, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxBetween(String value1, String value2) {
+            addCriterion("qddcx between", value1, value2, "qddcx");
+            return (Criteria) this;
+        }
+
+        public Criteria andQddcxNotBetween(String value1, String value2) {
+            addCriterion("qddcx not between", value1, value2, "qddcx");
+            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/PfDnjzjyServiceImpl.java

@@ -0,0 +1,87 @@
+package com.ghsc.partybuild.service.impl.partyLife;
+
+import com.ghsc.partybuild.mapper.PfDnjzjyMapper;
+import com.ghsc.partybuild.mapper.PfDnjzjyCQuery;
+import com.ghsc.partybuild.model.PfDnjzjy;
+import com.ghsc.partybuild.model.PfDnjzjyExample;
+import com.ghsc.partybuild.service.partyLife.PfDnjzjyService;
+import com.ghsc.partybuild.util.StringUtils;
+import com.ghsc.partybuild.vo.partyLife.PfDnjzjyVo;
+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("PfDnjzjyService")
+public class PfDnjzjyServiceImpl implements PfDnjzjyService {
+    @Autowired
+    private PfDnjzjyMapper pfDnjzjyMapper;
+    @Autowired
+    private PfDnjzjyCQuery pfDnjzjyCQuery;
+    @Autowired
+    private StringUtils stringUtils;
+
+    @Override
+    public PageInfo<PfDnjzjyVo> getList(int pageIndex, int pageSize, String id, String dzzdm, Date startDate, Date endDate, String zt){
+        PageHelper.startPage(pageIndex, pageSize);
+        List<PfDnjzjyVo> list = pfDnjzjyCQuery.selectPfDnjzjyList(id, dzzdm, startDate, endDate, zt);
+
+        PageInfo<PfDnjzjyVo> result = new PageInfo(list);
+        return result;
+    }
+
+    @Override
+    public PfDnjzjyVo getPfDnjzjyById(String id) {
+        if (stringUtils.IsNullOrEmpty(id))
+            return null;
+
+        List<PfDnjzjyVo> list = getList(1,999999, id, null, null, null, null).getList();
+        return list.size() > 0 ? list.get(0) : null;
+    }
+
+    @Override
+    public int save(PfDnjzjyVo data, String userId) {
+        int result = 0;
+        PfDnjzjy dbModel = pfDnjzjyMapper.selectByPrimaryKey(data.getId());
+        if (dbModel == null) {
+            dbModel = new PfDnjzjy();
+            dbModel.setId(data.getId());
+            dbModel.setDzzdm(data.getDzzdm());
+            dbModel.setJykssj(data.getJykssj());
+            dbModel.setJyjssj(data.getJyjssj());
+            dbModel.setZt(data.getZt());
+            dbModel.setZygzbz(data.getZygzbz());
+            dbModel.setQddcx(data.getQddcx());
+            dbModel.setCreateTime(new Date());
+            dbModel.setCreateUserid(userId);
+            dbModel.setUpdateTime(new Date());
+            dbModel.setUpdateUserid(userId);
+
+            result = pfDnjzjyMapper.insert(dbModel);
+        } else {
+            dbModel.setDzzdm(data.getDzzdm());
+            dbModel.setJykssj(data.getJykssj());
+            dbModel.setJyjssj(data.getJyjssj());
+            dbModel.setZt(data.getZt());
+            dbModel.setZygzbz(data.getZygzbz());
+            dbModel.setQddcx(data.getQddcx());
+            dbModel.setUpdateTime(new Date());
+            dbModel.setUpdateUserid(userId);
+
+            result = pfDnjzjyMapper.updateByPrimaryKey(dbModel);
+        }
+        
+        return result;
+    }
+
+    @Override
+    public int delete(List<String> idList) {
+        PfDnjzjyExample exp = new PfDnjzjyExample();
+        exp.or().andIdIn(idList);
+
+        return pfDnjzjyMapper.deleteByExample(exp);
+    }
+}

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

@@ -66,10 +66,10 @@ public class ReportSystemServiceImpl implements ReportSystemService {
             dbModel.setSx(data.getSx());
             dbModel.setFs(data.getFs());
             dbModel.setFkqk(data.getFkqk());
-            data.setUpdatetime(new Date());
-            data.setUpdateuserid(userId);
+            dbModel.setUpdatetime(new Date());
+            dbModel.setUpdateuserid(userId);
 
-            result = pfReportsystemMapper.updateByPrimaryKey(data);
+            result = pfReportsystemMapper.updateByPrimaryKey(dbModel);
         }
         
         return result;

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

@@ -0,0 +1,17 @@
+package com.ghsc.partybuild.service.partyLife;
+
+import com.ghsc.partybuild.vo.partyLife.PfDnjzjyVo;
+import com.github.pagehelper.PageInfo;
+
+import java.util.Date;
+import java.util.List;
+
+public interface PfDnjzjyService {
+    PageInfo<PfDnjzjyVo> getList(int pageIndex, int pageSize, String id, String dzzdm, Date startDate, Date endDate, String zt);
+
+    PfDnjzjyVo getPfDnjzjyById(String id);
+
+    int save(PfDnjzjyVo data, String userId);
+
+    int delete(List<String> idList);
+}

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

@@ -0,0 +1,11 @@
+package com.ghsc.partybuild.vo.partyLife;
+
+import com.ghsc.partybuild.model.PfDnjzjy;
+import lombok.Data;
+
+
+@Data
+public class PfDnjzjyVo extends PfDnjzjy {
+    private String dzzmc;
+    private String createusername;
+}

src/main/resources/generatorConfig.xml

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

src/main/resources/mapping/PfDnjzjyCQuery.xml

@@ -0,0 +1,50 @@
+<?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.PfDnjzjyCQuery">
+    <resultMap id="BaseResultMap" type="com.ghsc.partybuild.vo.partyLife.PfDnjzjyVo">
+        <id column="id" jdbcType="VARCHAR" property="id" />
+        <result column="dzzdm" jdbcType="VARCHAR" property="dzzdm" />
+        <result column="jykssj" jdbcType="VARCHAR" property="jykssj" />
+        <result column="jyjssj" jdbcType="VARCHAR" property="jyjssj" />
+        <result column="zt" jdbcType="VARCHAR" property="zt" />
+        <result column="zygzbz" jdbcType="VARCHAR" property="zygzbz" />
+        <result column="qddcx" jdbcType="VARCHAR" property="qddcx" />
+        <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="selectPfDnjzjyList" resultMap="BaseResultMap">
+        select pd.id, pd.dzzdm, pd.jykssj, pd.jyjssj, pd.zt, pd.zygzbz, pd.qddcx,
+        pd.create_time, pd.create_userid, pd.update_time, pd.update_userid,
+        zz.dzzmc,cu.username
+        from pf_dnjzjy 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>
+          <choose>
+              <when test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
+                  and (pd.jykssj <![CDATA[ <= ]]> #{endDate} and pd.jyjssj <![CDATA[ >= ]]> #{startDate})
+              </when>
+              <when test="startDate!=null and startDate!=''">
+                  and pd.jykssj <![CDATA[ <= ]]> #{startDate}
+              </when>
+              <when test="startDate!=null and startDate!=''">
+                  and pd.jyjssj <![CDATA[ <= ]]> #{endDate}
+              </when>
+              <otherwise></otherwise>
+          </choose>
+        <if test="zt != null and zt != ''">
+            and pd.zt like concat('%',#{zt},'%')
+        </if>
+        order by pd.create_time desc
+    </select>
+</mapper>

src/main/resources/mapping/PfDnjzjyMapper.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.PfDnjzjyMapper">
+  <resultMap id="BaseResultMap" type="com.ghsc.partybuild.model.PfDnjzjy">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="dzzdm" jdbcType="VARCHAR" property="dzzdm" />
+    <result column="jykssj" jdbcType="VARCHAR" property="jykssj" />
+    <result column="jyjssj" jdbcType="VARCHAR" property="jyjssj" />
+    <result column="zt" jdbcType="VARCHAR" property="zt" />
+    <result column="zygzbz" jdbcType="VARCHAR" property="zygzbz" />
+    <result column="qddcx" jdbcType="VARCHAR" property="qddcx" />
+    <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, jykssj, jyjssj, zt, zygzbz, qddcx, create_time, create_userid, update_time, 
+    update_userid
+  </sql>
+  <select id="selectByExample" parameterType="com.ghsc.partybuild.model.PfDnjzjyExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pf_dnjzjy
+    <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_dnjzjy
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pf_dnjzjy
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ghsc.partybuild.model.PfDnjzjyExample">
+    delete from pf_dnjzjy
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ghsc.partybuild.model.PfDnjzjy">
+    insert into pf_dnjzjy (id, dzzdm, jykssj, 
+      jyjssj, zt, zygzbz, 
+      qddcx, create_time, create_userid, 
+      update_time, update_userid)
+    values (#{id,jdbcType=VARCHAR}, #{dzzdm,jdbcType=VARCHAR}, #{jykssj,jdbcType=VARCHAR}, 
+      #{jyjssj,jdbcType=VARCHAR}, #{zt,jdbcType=VARCHAR}, #{zygzbz,jdbcType=VARCHAR}, 
+      #{qddcx,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateUserid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ghsc.partybuild.model.PfDnjzjy">
+    insert into pf_dnjzjy
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="dzzdm != null">
+        dzzdm,
+      </if>
+      <if test="jykssj != null">
+        jykssj,
+      </if>
+      <if test="jyjssj != null">
+        jyjssj,
+      </if>
+      <if test="zt != null">
+        zt,
+      </if>
+      <if test="zygzbz != null">
+        zygzbz,
+      </if>
+      <if test="qddcx != null">
+        qddcx,
+      </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="jykssj != null">
+        #{jykssj,jdbcType=VARCHAR},
+      </if>
+      <if test="jyjssj != null">
+        #{jyjssj,jdbcType=VARCHAR},
+      </if>
+      <if test="zt != null">
+        #{zt,jdbcType=VARCHAR},
+      </if>
+      <if test="zygzbz != null">
+        #{zygzbz,jdbcType=VARCHAR},
+      </if>
+      <if test="qddcx != null">
+        #{qddcx,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.PfDnjzjyExample" resultType="java.lang.Long">
+    select count(*) from pf_dnjzjy
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update pf_dnjzjy
+    <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.jykssj != null">
+        jykssj = #{record.jykssj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jyjssj != null">
+        jyjssj = #{record.jyjssj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zt != null">
+        zt = #{record.zt,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zygzbz != null">
+        zygzbz = #{record.zygzbz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qddcx != null">
+        qddcx = #{record.qddcx,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_dnjzjy
+    set id = #{record.id,jdbcType=VARCHAR},
+      dzzdm = #{record.dzzdm,jdbcType=VARCHAR},
+      jykssj = #{record.jykssj,jdbcType=VARCHAR},
+      jyjssj = #{record.jyjssj,jdbcType=VARCHAR},
+      zt = #{record.zt,jdbcType=VARCHAR},
+      zygzbz = #{record.zygzbz,jdbcType=VARCHAR},
+      qddcx = #{record.qddcx,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.PfDnjzjy">
+    update pf_dnjzjy
+    <set>
+      <if test="dzzdm != null">
+        dzzdm = #{dzzdm,jdbcType=VARCHAR},
+      </if>
+      <if test="jykssj != null">
+        jykssj = #{jykssj,jdbcType=VARCHAR},
+      </if>
+      <if test="jyjssj != null">
+        jyjssj = #{jyjssj,jdbcType=VARCHAR},
+      </if>
+      <if test="zt != null">
+        zt = #{zt,jdbcType=VARCHAR},
+      </if>
+      <if test="zygzbz != null">
+        zygzbz = #{zygzbz,jdbcType=VARCHAR},
+      </if>
+      <if test="qddcx != null">
+        qddcx = #{qddcx,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.PfDnjzjy">
+    update pf_dnjzjy
+    set dzzdm = #{dzzdm,jdbcType=VARCHAR},
+      jykssj = #{jykssj,jdbcType=VARCHAR},
+      jyjssj = #{jyjssj,jdbcType=VARCHAR},
+      zt = #{zt,jdbcType=VARCHAR},
+      zygzbz = #{zygzbz,jdbcType=VARCHAR},
+      qddcx = #{qddcx,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

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     "use strict";
     angular.module('gtPartyApp', ['ui.router', 'oc.lazyLoad', 'ngSanitize', 'ngAnimate', 'mgcrea.ngStrap', 'ngFileUpload', 'devself.common', 'angularAwesomeSlider']).config(function ($stateProvider, $urlRouterProvider, $modalProvider, $tooltipProvider, $asideProvider, $alertProvider, $qProvider, $bsRouterStateProvider) {
 
@@ -3215,6 +3215,42 @@
                     return $ocLazyLoad.load('../main/partylife/reportsystem/detail.js?' + window.sysVersion);
                 }]
             }
+		 }).state("home.pf_dnjzjyList", {
+            url: "pf_dnjzjyList",
+            templateUrl: "../main/partylife/dnjzjy/list.html?" + window.sysVersion,
+            controller: "pf_dnjzjyListCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/dnjzjy/list.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_dnjzjyEdit", {
+            url: "pf_dnjzjyEdit",
+            templateUrl: "../main/partylife/dnjzjy/edit.html?" + window.sysVersion,
+            controller: "pf_dnjzjyEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/dnjzjy/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_dnjzjyAdd", {
+            url: "pf_dnjzjyAdd",
+            templateUrl: "../main/partylife/dnjzjy/edit.html?" + window.sysVersion,
+            controller: "pf_dnjzjyEditCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/dnjzjy/edit.js?' + window.sysVersion);
+                }]
+            }
+        }).state("home.pf_dnjzjyDetail", {
+            url: "pf_dnjzjyDetail",
+            templateUrl: "../main/partylife/dnjzjy/detail.html?" + window.sysVersion,
+            controller: "pf_dnjzjyDetailCtrl",
+            resolve: {
+                load: ['$ocLazyLoad', function ($ocLazyLoad) {
+                    return $ocLazyLoad.load('../main/partylife/dnjzjy/detail.js?' + window.sysVersion);
+                }]
+            }	
         }).state("register", {
             url: "/register",
             templateUrl: "../main/partyUser/admit/register/edit.html?" + window.sysVersion,

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

@@ -0,0 +1,32 @@
+<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.jykssj | date:'yyyy-MM-dd'}}~{{dataModel.jyjssj | date:'yyyy-MM-dd'}}</td>
+                            <th>主题</th>
+                            <td>{{dataModel.zt}}</td>
+                        </tr>
+                        <tr>
+                            <th>主要工作步骤</th>
+                            <td colspan="5">
+                                {{dataModel.zygzbz}}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>取得的成效</th>
+                            <td colspan="5">
+                                {{dataModel.qddcx}}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            <bsfiles ng-model="reqFileModel"/>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,37 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_dnjzjyDetailCtrl', 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/dnjzjy/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/dnjzjy/edit.html

@@ -0,0 +1,73 @@
+<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.jykssj.$invalid || this.editForm.jyjssj.$invalid) &&  this.editForm.$submitted}">
+                                    <div class="form-group">
+                                        <div class="form-line">
+                                    <input name="jykssj" class="form-control fm-ct-first"
+                                           autocomplete="off" autoclose="true"
+                                           data-date-format="yyyy-MM-dd" data-date-type="string"
+                                           ng-model="dataModel.jykssj"
+                                           placeholder="" bs-datepicker ng-required="true"/>
+                                    <input name="jyjssj" class="form-control fm-ct-last"
+                                           autocomplete="off" autoclose="true"
+                                           data-date-format="yyyy-MM-dd" data-date-type="string"
+                                           ng-model="dataModel.jyjssj"
+                                           placeholder="" bs-datepicker ng-required="true"/>
+                                    <span ng-show="(this.editForm.jykssj.$invalid || this.editForm.jyjssj.$invalid) &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                        </div>
+                                    </div>
+                                </td>
+                                <th>主题<span style="color:red;">*</span></th>
+                                <td ng-class="{ 'has-error' : this.editForm.zt.$invalid &&  this.editForm.$submitted}">
+                                    <input type="text" class="form-control" name="zt" autocomplete="off" autoclose="true"
+                                           ng-model="dataModel.zt" ng-required="true"/>
+                                    <span ng-show="this.editForm.zt.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </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>
+                            <tr>
+                                <th style="width: 5%;">取得的成效</th>
+                                <td colspan="5">
+                                   <textarea name="qddcx" ng-model="dataModel.qddcx"
+                                             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/dnjzjy/edit.js

@@ -0,0 +1,89 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_dnjzjyEditCtrl', 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.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.getData = function () {
+            $http
+            ({
+                method: 'get', url: "../../api/partylife/dnjzjy/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;
+                }
+            }, function (resp) {
+                $scope.showMsg('错误', '服务器错误：' + resp.data);
+            });
+        };
+
+        $scope.save = function (isflag) {
+            if (isflag) {
+
+                $loading.show();
+                $http({
+                    method: "post",
+                    url: "../../api/partylife/dnjzjy/save",
+                    data: $scope.dataModel
+                }).then(function (result) {
+                    $loading.hide();
+                    if (result.data.success) {
+                        $scope.showMsg('成功', "操作成功");
+                        $scope.pagechange();
+                        //重新刷新列表
+                        $scope.$emit("tabReloadData", {name: 'pf_dnjzjyListCtrl', 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/dnjzjy/list.html

@@ -0,0 +1,184 @@
+<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="startDate" class="form-control fm-ct-first"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.startDate"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                                <input name="endDate" class="form-control fm-ct-last"
+                                                       autocomplete="off"
+                                                       autoclose="true"
+                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       ng-model="selectparams.endDate"
+                                                       ng-change="search()"
+                                                       placeholder="" bs-datepicker/>
+                                            </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="zt" class="form-control" type="text"
+                                                       ng-keypress="($event.which === 13)?search():0"
+                                                       ng-model="selectparams.zt"
+                                                       placeholder=""/>
+
+                                            </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.jykssj | date:'yyyy-MM-dd'}}</td>
+                                    <td>{{it.jyjssj | date:'yyyy-MM-dd'}}</td>
+                                    <td>{{it.dzzmc}}</td>
+                                    <td>{{it.zt}}</td>
+                                    <td style="min-width: 150px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.zygzbz}}</td>
+                                    <td style="min-width: 300px !important;word-wrap: break-word;word-break: break-all;white-space: normal;">{{it.qddcx}}</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/dnjzjy/list.js

@@ -0,0 +1,173 @@
+(function ($app) {
+    $app.module('gtPartyApp').controller('pf_dnjzjyListCtrl', function ($scope, $http, $modal, $ocLazyLoad, $alert, $loading, $state, $bsRouterState, AuthUser, $timeout, $excel, $partySelect, $filter) {
+        $scope.loginUserId = AuthUser.getUser().Id;
+        $scope.isShow = false;
+        $scope.moreTxt = "更多";
+        $scope.isAll = false;
+        $scope.tabNameAdd = "home.pf_dnjzjyAdd";
+        $scope.tabNameEdit = "home.pf_dnjzjyEdit";
+        $scope.tabNameDetail = "home.pf_dnjzjyDetail";
+
+        //定义数据集合
+        $scope.dataList = []; //列表数据
+        //组织树参数
+        $scope.treeparams = {
+            isunfold: false,//组织结构树展开收缩
+            selectdzzdm: "",
+            selectdzzmc: "",
+            defaultselected: $state.params.dzzdm
+        };
+        $scope.resetTreeparams = angular.copy($scope.treeparams);
+
+        //查询条件
+        $scope.selectparams = {
+            pageindex: 1,
+            pagesize: 10,
+            partyLifeMeetingType: $scope.partyLifeMeetingType,
+            dzzdm: '',
+            startDate: null,
+            endDate: null,
+            zt: '',
+            dx: '',
+            sx: ''
+        };
+        $scope.resetSelectparams = angular.copy($scope.selectparams);
+        $scope.pageInfo = {ptotal: 0};
+
+        $scope.$on('tabChildReloadData', function (event, data) {
+            if (data.name == 'pf_dnjzjyListCtrl') {
+                $scope.loadData();
+            }
+        });
+
+        //加载列表数据
+        $scope.loadData = function () {
+            $http
+            ({
+                method: 'get', url: '../../api/partylife/dnjzjy/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/dnjzjy/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/dnjzjy/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);