xn

src/main/java/com/dsic/gj_erp/annotation/Dict.java

@@ -29,4 +29,11 @@ public @interface Dict {
      * @return
      */
     String dictText() default "";
+
+    /**
+     * 数据字典表
+     * @return
+     */
+
+    String dictTable() default "";
 }

src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java

@@ -1,6 +1,8 @@
 package com.dsic.gj_erp.bean.jcsj;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,101 +26,37 @@ public class EmSbcnp implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-    @ApiModelProperty(value = "跨位")
+        @ApiModelProperty(value = "套料图号")
-    private String kw;
+        private String tzbh;
 
-    @ApiModelProperty(value = "工序")
+        @ApiModelProperty(value = "组立")
-    private String gx;
+        private String zl;
 
-    @ApiModelProperty(value = "产能单位")
+        @ApiModelProperty(value = "加工跨")
-    private String cndw;
+        private String kw;
 
-    @ApiModelProperty(value = "白班最小产能")
-    private Double zxcnBb;
 
-    @ApiModelProperty(value = "白班最大产能")
+        private String gx;
-    private Double zdcnBb;
+        private String jldw;
 
-    @ApiModelProperty(value = "夜班最小产能")
+        @ApiModelProperty(value = "定额工时")
-    private Double zxcnYb;
+        @TableField(updateStrategy = FieldStrategy.IGNORED)
+        private Double degs;
 
-    @ApiModelProperty(value = "夜班最大产能")
+        @ApiModelProperty(value = "实动工时")
-    private Double zdcnYb;
+        @TableField(updateStrategy = FieldStrategy.IGNORED)
+        private Double sdgs;
 
-    @ApiModelProperty(value = "合计")
+        @ApiModelProperty(value = "加工顺序")
-    private Double cnhj;
+        private String jgsx;
 
-    @ApiModelProperty(value = "划线白班最小产能")
+        @ApiModelProperty(value = "编辑人")
-    private Double zxcnBb1;
+        private String bjry;
 
-    @ApiModelProperty(value = "划线白班最大产能")
+        @ApiModelProperty(value = "编辑日期")
-    private Double zdcnBb1;
+        private String bjrq;
-
-    @ApiModelProperty(value = "划线夜班最小产能")
-    private Double zxcnYb1;
-
-    @ApiModelProperty(value = "划线夜班最大产能")
-    private Double zdcnYb1;
-
-    @ApiModelProperty(value = "合计")
-    private Double cnhj1;
-
-    @ApiModelProperty(value = "坡口白班最小产能")
-    private Double zxcnBb2;
-
-    @ApiModelProperty(value = "坡口白班最大产能")
-    private Double zdcnBb2;
-
-    @ApiModelProperty(value = "坡口夜班最小产能")
-    private Double zxcnYb2;
-
-    @ApiModelProperty(value = "坡口夜班最大产能")
-    private Double zdcnYb2;
-
-    @ApiModelProperty(value = "坡口合计")
-    private Double cnhj2;
-
-    @ApiModelProperty(value = "坡口产能单位")
-    private String cndw2;
-
-    @ApiModelProperty(value = "打磨白班最小产能")
-    private Double zxcnBb3;
-
-    @ApiModelProperty(value = "打磨白班最大产能")
-    private Double zdcnBb3;
-
-    @ApiModelProperty(value = "打磨夜班最小产能")
-    private Double zxcnYb3;
-
-    @ApiModelProperty(value = "打磨夜班最大产能")
-    private Double zdcnYb3;
-
-    @ApiModelProperty(value = "打磨合计")
-    private Double cnhj3;
-
-    @ApiModelProperty(value = "打磨产能单位")
-    private String cndw3;
-
-    @ApiModelProperty(value = "曲白班最小产能")
-    private Double zxcnBb4;
-
-    @ApiModelProperty(value = "曲白班最大产能")
-    private Double zdcnBb4;
-
-    @ApiModelProperty(value = "曲夜班最小产能")
-    private Double zxcnYb4;
-
-    @ApiModelProperty(value = "曲夜班最大产能")
-    private Double zdcnYb4;
-
-    @ApiModelProperty(value = "曲合计")
-    private Double cnhj4;
-
-    @ApiModelProperty(value = "曲产能单位")
-    private String cndw4;
-
-    @TableId(value = "id", type = IdType.ASSIGN_UUID)
-    private String id;
 
+        @TableId(value = "id", type = IdType.ASSIGN_UUID)
+        private String id;
 
 }

src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java

@@ -49,13 +49,17 @@ public class DmSygdMx implements Serializable {
     private String wpxh;
 
     @ApiModelProperty(value = "划线长度(米)")
-    private BigDecimal hxcd;
+    private Double hxcd;
-
+    private Double dmcd;
+    private String dmrq;
+    private String pkrq;
+    private String llrq;
     @ApiModelProperty(value = "切割长度（米）")
-    private BigDecimal qgcd;
+    private Double qgcd;
 
     @ApiModelProperty(value = "曲标识")
     private String qbs;
+    private String qjgrq;
 
     @ApiModelProperty(value = "坡口类型")
     private Double pklx;
@@ -177,19 +181,11 @@ public class DmSygdMx implements Serializable {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
-    private BigDecimal blgs;//备料总工时
-    private BigDecimal pwgs;//抛丸总工时
-    private BigDecimal llgs;//理料总工时
-    private BigDecimal hxgs;//划线总工时
-    private BigDecimal qggs;//切割总工时
-    private BigDecimal pkgs;//坡口总工时
-    private BigDecimal dmgs;//打磨总工时
-    private BigDecimal qgs;//曲加工总工时
-    private BigDecimal zpgs;//装配总工时
-
     private String xxr;
     @TableField(exist = false)
     private String beginTime;
     @TableField(exist = false)
     private String endTime;
+
+
 }

src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java

@@ -12,7 +12,7 @@ public class Xbjhdto extends DmXbjh {
 
    private Double xczl;//相差重量
    private Double zrc_zl;//实耗重量
-   private Double tlt_zl;//套料图重量
+   private Double tlt_zl=0.0;//套料图重量
 
    private List<DmSygdMx>  mxList;
 }

src/main/java/com/dsic/gj_erp/bean/sy/DmDepart.java

@@ -0,0 +1,103 @@
+package com.dsic.gj_erp.bean.sy;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 部门表
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmDepart对象", description="部门表")
+public class DmDepart implements Serializable{
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "depart_code", type = IdType.INPUT)
+    private String departCode;
+
+    private String departName;
+
+    private String parentCode;
+
+    @ApiModelProperty(value = "单位全称")
+    private String departFullname;
+
+    private String sortNo;
+
+    @ApiModelProperty(value = "单位属性")
+    private String departAttr;
+
+    @ApiModelProperty(value = "单位类型")
+    private String departType;
+
+    @ApiModelProperty(value = "生产性质")
+    private String manuType;
+
+    @ApiModelProperty(value = "状态 1-有效(默认) 0-无效")
+    private Integer departStatus;
+
+    @ApiModelProperty(value = "制作标识 1-选择 0-未选择(默认)")
+    private Integer manuFlag;
+
+    @ApiModelProperty(value = "表面处理标识 1-选择 0-未选择(默认)")
+    private Integer paintFlag;
+
+    @ApiModelProperty(value = "配送标识 1-选择 0-未选择(默认)")
+    private Integer distFlag;
+
+    @ApiModelProperty(value = "水压标识 1-选择 0-未选择(默认)")
+    private Integer syFlag;
+
+    @ApiModelProperty(value = "负责人")
+    private String charger;
+
+    @ApiModelProperty(value = "座机电话")
+    private String landlinePhone;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobilePhone;
+
+    @ApiModelProperty(value = "描述")
+    private String remark;
+
+    @ApiModelProperty(value = "配送单位2022.2.8")
+    private String  psDept;
+
+    @ApiModelProperty(value = "涂装单位2022.2.8")
+    private String  tzDept;
+
+    @ApiModelProperty(value = "涂装单位2022.2.8")
+    private String  clDept;
+
+    @ApiModelProperty(value = "非包显示2022.2.8")
+    private String  fbxs;
+
+    @ApiModelProperty(value = "大包显示2022.2.8")
+    private String  dbxs;
+
+    @ApiModelProperty(value = "小包显示2022.2.8")
+    private String  xbxs;
+
+    //铁舾排序
+    @TableField("sort_3")
+    private String sort3;//结构排序
+    @TableField("sort_4")
+    private String sort4;//涂装排序
+    @TableField("sort_5")
+    private String sort5;//镀锌排序
+    @TableField("sort_6")
+    private String sort6;//配送排序
+}

src/main/java/com/dsic/gj_erp/bean/sy/DmDepartIn.java

@@ -0,0 +1,27 @@
+package com.dsic.gj_erp.bean.sy;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @version V1.0.0
+ * @Title: DmDepartIn
+ * @Package com.dsic.xzerp.bean.sy
+ * @Description: 单位部门入参
+ * @author: 张恩铭
+ * @date: 2021/5/12 11:03
+ */
+@Data
+public class DmDepartIn implements Serializable {
+
+    private String departCode;
+    private String departAttr;
+    private String departType;
+    private String manuType;
+    private String manuFlag;
+    private String bmbm;
+    private String zxtbm;
+    private String parentCode;
+
+}

src/main/java/com/dsic/gj_erp/bean/sy/DmEmployee.java

@@ -0,0 +1,59 @@
+package com.dsic.gj_erp.bean.sy;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @version V1.0.0
+ * @Title: DmEmployee
+ * @Package com.dsic.xzerp.bean.sy
+ * @Description: 管系制造员工
+ * @author: 张恩铭
+ * @date: 2021/4/1 15:49
+ */
+@Data
+@ApiModel("管系制造员工")
+public class DmEmployee implements Serializable {
+
+    @ApiModelProperty("id")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty("部门科室编码")
+    private String departCode;
+
+    @ApiModelProperty("职号")
+    private String employeeNo;
+
+    @ApiModelProperty("姓名")
+    private String employeeName;
+
+    @ApiModelProperty("性别")
+    private String gender;
+
+    @ApiModelProperty("在职状态")
+    private Integer employeeStatus;
+
+    @ApiModelProperty("岗位")
+    private String position;
+
+    @ApiModelProperty("责任区域")
+    private String zone;//责任区域对应字典ZRQY 1:船装;2:机装;3:局装
+
+    @ApiModelProperty("职称")
+    private String title;
+
+    @ApiModelProperty("座机电话")
+    private String landlinePhone;
+
+    @ApiModelProperty("移动电话")
+    private String mobilePhone;
+
+    @ApiModelProperty("备注")
+    private String remark;
+}

src/main/java/com/dsic/gj_erp/bean/sy/DmPipeSystem.java

@@ -0,0 +1,60 @@
+package com.dsic.gj_erp.bean.sy;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 管系系统数据
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="DmPipeSystem对象", description="管系系统数据")
+public class DmPipeSystem implements Serializable {
+
+
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工程编号 Q11")
+    private String project;
+
+    @ApiModelProperty(value = "所属部门 默认02")
+    private String departCode;
+
+    //@Dict(dictCode = "test_code")
+    @ApiModelProperty(value = "系统代号 Q12")
+    private String stCode;
+
+    @ApiModelProperty(value = "系统名称 Q21")
+    private String stName;
+
+    @ApiModelProperty(value = "四大系统标识 默认N")
+    private String stFlag;
+
+    @ApiModelProperty(value = "系统英文名称")
+    private String stEname;
+
+    private String stDwgno;
+
+    private String bzry;
+
+    private String bzrq;
+
+    private String remark;
+
+    private String jjCode;
+
+
+}

src/main/java/com/dsic/gj_erp/bean/sy/SyDict.java

@@ -0,0 +1,42 @@
+package com.dsic.gj_erp.bean.sy;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="SyDict对象", description="")
+@Accessors(chain = true)
+public class SyDict  {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "字典编码")
+   // @TableId(value = "dict_code", type = IdType.ASSIGN_UUID)
+    @TableId
+    private String dictCode;
+
+    @ApiModelProperty(value = "字典名称")
+    private String dictName;
+
+    @ApiModelProperty(value = "子系统")
+    private String systemCode;
+
+    @ApiModelProperty(value = "描述")
+    private String remark;
+
+
+
+}

src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java

@@ -0,0 +1,96 @@
+package com.dsic.gj_erp.bean.sy;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsic.gj_erp.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="SyDictItem对象", description="")
+public class SyDictItem implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+    @Dict(dictTable ="sy_dict",dictText = "dict_name",dictCode = "dict_code")
+    @ApiModelProperty(value = "字典编码")
+    private String dictCode;
+
+    @ApiModelProperty(value = "字典项文本")
+    private String itemCode;
+
+    @ApiModelProperty(value = "字典项值")
+    private String itemValue;
+
+    @ApiModelProperty(value = "描述")
+    private String remark;
+
+    @ApiModelProperty(value = "排序")
+    private String sortNo;
+
+    private String params1;
+
+    private String params2;
+
+    private String params3;
+
+    private String params4;
+
+    private String params5;
+
+    private String ylzd5;//铁舾油漆旧消耗系数
+    private String yqxs1;//铁舾油漆新消耗系数
+
+    //集团切块
+    private String jtqk;
+
+    //舾装切块
+    private String xzqk;
+
+    //统计类型
+    private String tjlx;
+
+    //工艺类型
+    private String gylx;
+
+    //分析类型1
+    private String fxlx1;
+
+    //分析类型2
+    private String fxlx2;
+
+    //gj下  管径范围>=
+    private BigDecimal params6;
+    //gj下管径范围<=
+    private BigDecimal params7;
+    //gj下消耗系数
+    private BigDecimal params8;
+    //gj下附件消耗系数
+    private BigDecimal params9;
+    //gj下限额消耗系数
+    private BigDecimal params10;
+
+
+
+
+
+
+
+}

src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java

@@ -0,0 +1,66 @@
+package com.dsic.gj_erp.bean.sy;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import com.dsic.gj_erp.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统日志表
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-04-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="SyLog对象", description="系统日志表")
+public class SyLog extends Model<SyLog> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "职号")
+    private String userCode;
+
+    @ApiModelProperty(value = "姓名")
+    private String userName;
+
+    @Dict(dictTable ="sy_system",dictText = "system_name",dictCode = "system_code")
+    @ApiModelProperty(value = "子系统编码")
+    private String systemCode;
+
+    @ApiModelProperty(value = "子系统名称")
+    private String systemName;
+
+    @ApiModelProperty(value = "使用内容:模块>子模块>菜单名称")
+    private String content;
+
+    @ApiModelProperty(value = "方法")
+    private String method;
+
+    @ApiModelProperty(value = "计算机名")
+    private String computerName;
+
+    private String ip;
+
+    @ApiModelProperty(value = "使用日期时间")
+    private String createTime;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

src/main/java/com/dsic/gj_erp/bean/tree/PhTreeVo.java

@@ -0,0 +1,30 @@
+package com.dsic.gj_erp.bean.tree;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @version V1.0.0
+ * @Title: ProjectTreeVo
+ * @Package com.dsic.xzerp.bean.tree
+ * @Description: tree
+ * @author: xhj
+ * @date: 2021/3/15 13:18
+ */
+@Data
+@Accessors(chain = true)
+public class PhTreeVo {
+    private String id;
+    private String parentBm;
+    private String label;
+    private String departCode;
+    private String status;
+
+    private String lckStatus;
+    private String dwgNo;
+    private String dwgType;
+    private String bzry;
+    private List<PhTreeVo> children;
+}

src/main/java/com/dsic/gj_erp/bean/tree/ProjectTreeVo.java

@@ -0,0 +1,23 @@
+package com.dsic.gj_erp.bean.tree;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @version V1.0.0
+ * @Title: ProjectTreeVo
+ * @Package com.dsic.xzerp.bean.tree
+ * @Description: tree
+ * @author: xhj
+ * @date: 2021/3/15 13:18
+ */
+@Data
+@Accessors(chain = true)
+public class ProjectTreeVo {
+    private String id;
+    private String parentBm;
+    private String label;
+    private List<ProjectTreeVo> children;
+}

src/main/java/com/dsic/gj_erp/bean/tree/Tree.java

@@ -0,0 +1,30 @@
+package com.dsic.gj_erp.bean.tree;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @version V1.0.0
+ * @Title: ProjectTreeVo
+ * @Package com.dsic.xzerp.bean.tree
+ * @Description: tree
+ * @author: xhj
+ * @date: 2021/3/15 13:18
+ */
+@Data
+@Accessors(chain = true)
+public class Tree {
+    private String id;
+    private String parentBm;
+    private String parentValue;
+    private String label;
+    private List<Tree> children;
+    private String value;
+
+    private String level;
+
+    private String params;
+   // private String lckId;
+}

src/main/java/com/dsic/gj_erp/controller/SYController.java

@@ -274,4 +274,143 @@ public class SYController {
         return new ResultBean(dmZhbmp);
     }
 
+//    ----------------------------------------------------------------
+
+
+    @RequestMapping(value = "/getDepartList")
+    public ResultBean getDepartList() {
+        return new ResultBean(syService.getDepartList());
+    }
+
+
+    @RequestMapping(value = "/addRole")
+    public ResultBean addRole(@RequestBody Map role) {
+        return new ResultBean(syService.addRole(role));
+    }
+
+
+    @RequestMapping(value = "/deleteRole")
+    public ResultBean deleteRole(@RequestBody Map paramMap) {
+        return new ResultBean(syService.deleteRole((String) paramMap.get("role_code")));
+    }
+
+
+    @RequestMapping(value = "/updateRole")
+    public ResultBean updateRole(@RequestBody Map role) {
+        return new ResultBean(syService.updateRole(role));
+    }
+
+    @RequestMapping(value = "/getRoleList")
+    public ResultBean getRoleList() {
+        return new ResultBean(syService.getRoleList());
+    }
+
+
+    @RequestMapping(value = "/getRoleListByUser")
+    public ResultBean getRoleListByUser(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getRoleListByUser((String) paramMap.get("user_code")));
+    }
+
+    @RequestMapping(value = "/addRoleForUser")
+    public ResultBean addRoleForUser(@RequestBody List<Map<String, Object>> paramList) {
+        syService.addRoleForUser(paramList);
+        return new ResultBean();
+    }
+
+    @RequestMapping(value = "/deleteRoleForUser")
+    public ResultBean deleteRoleForUser(@RequestBody List<Map<String, Object>> paramList) {
+        syService.deleteRoleForUser(paramList);
+        return new ResultBean();
+    }
+
+
+    @RequestMapping(value = "/getSystemList")
+    public ResultBean getSystemList(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getSystemList());
+    }
+
+    @RequestMapping(value = "/getMenuList")
+    public ResultBean getMenuList(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getMenuList());
+    }
+
+
+    @RequestMapping(value = "/getUserListByMenu")
+    public ResultBean getUserListByMenu(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getUserListByMenu(Integer.parseInt(paramMap.get("id").toString())));
+    }
+
+
+    @RequestMapping(value = "/getInstitutionList")
+    public ResultBean getInstitutionList(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getInstitutionList());
+    }
+
+
+    @RequestMapping(value = "/getUserListByRole")
+    public ResultBean getUserListByRole(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getUserListByRole(paramMap.get("role_code").toString()));
+    }
+
+
+    @RequestMapping(value = "/addRoleForInstitution")
+    public ResultBean addRoleForInstitution(@RequestBody List<Map<String, Object>> paramList) {
+        syService.addRoleForInstitution(paramList);
+        return new ResultBean();
+    }
+
+    @RequestMapping(value = "/deleteRoleForInstitution")
+    public ResultBean deleteRoleForInstitution(@RequestBody List<Map<String, Object>> paramList) {
+        syService.deleteRoleForInstitution(paramList);
+        return new ResultBean();
+    }
+
+
+    @RequestMapping(value = "/getInstitutionListByRole")
+    public ResultBean getInstitutionListByRole(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getInstitutionListByRole(paramMap.get("role_code").toString()));
+    }
+
+
+    @RequestMapping(value = "/getSystemListByRole")
+    public ResultBean getSystemListByRole(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getSystemListByRole(paramMap.get("role_code").toString()));
+    }
+
+
+    @RequestMapping(value = "/addRoleForSystem")
+    public ResultBean addRoleForSystem(@RequestBody List<Map<String, Object>> paramList) {
+        syService.addRoleForSystem(paramList);
+        return new ResultBean();
+    }
+
+    @RequestMapping(value = "/deleteRoleForSystem")
+    public ResultBean deleteRoleForSystem(@RequestBody List<Map<String, Object>> paramList) {
+        syService.deleteRoleForSystem(paramList);
+        return new ResultBean();
+    }
+
+
+
+
+
+    @RequestMapping(value = "/getMenuListByRole")
+    public ResultBean getMenuListByRole(@RequestBody Map<String, Object> paramMap) {
+        return new ResultBean(syService.getMenuListByRole(paramMap.get("role_code").toString()));
+    }
+
+
+    @RequestMapping(value = "/addRoleForMenu")
+    public ResultBean addRoleForMenu(@RequestBody List<Map<String, Object>> paramList) {
+        syService.addRoleForMenu(paramList);
+        return new ResultBean();
+    }
+
+    @RequestMapping(value = "/deleteRoleForMenu")
+    public ResultBean deleteRoleForMenu(@RequestBody List<Map<String, Object>> paramList) {
+        syService.deleteRoleForMenu(paramList);
+        return new ResultBean();
+    }
+
+
 }

src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java

@@ -1,7 +1,9 @@
 package com.dsic.gj_erp.controller.jcsj;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.bean.jcsj.EmSbwxjh;
@@ -43,16 +45,30 @@ public class EmSbcnpController {
 
     @ApiOperation(value = "批量新增")
     @PostMapping(value = "/save")
-    public ResultBean save(@RequestBody List<EmSbcnp> emSbcnps) {
+    @AuthFunction
-        emSbcnpService.save(emSbcnps);
+    public ResultBean save(@RequestBody List<EmSbcnp> emSbcnps, HttpServletRequest req) {
+        String username=(String) req.getAttribute("yhms");
+        String day= DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
+        emSbcnps.forEach(l->{
+            l.setBjry(username);
+            l.setBjrq(day);
+        });
+        emSbcnpService.saveBatch(emSbcnps);
 
         return new ResultBean();
     }
 
     @ApiOperation(value = "批量修改")
     @PostMapping(value = "/update")
-    public ResultBean update(@RequestBody List<EmSbcnp> sbjbbs) {
+    @AuthFunction
-        emSbcnpService.updateBatchById(sbjbbs);
+    public ResultBean update(@RequestBody List<EmSbcnp> emSbcnps, HttpServletRequest req) {
+        String username=(String) req.getAttribute("yhms");
+        String day= DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
+        emSbcnps.forEach(l->{
+            l.setBjry(username);
+            l.setBjrq(day);
+        });
+        emSbcnpService.updateBatchById(emSbcnps);
 
         return new ResultBean();
     }

src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java

@@ -91,7 +91,7 @@ public class DmSygdMxController {
     @AuthFunction
     public ResultBean getCnsb(){
        List<EmSbcnp> list= emSbcnpService.list();
-       Map<String,List<EmSbcnp>> map= list.stream().filter(l -> Objects.nonNull(l.getGx())).collect(Collectors.groupingBy(EmSbcnp::getGx));
+       Map<String,List<EmSbcnp>> map= list.stream().filter(l -> Objects.nonNull(l.getTzbh())).collect(Collectors.groupingBy(EmSbcnp::getTzbh));
        return new ResultBean(map);
     }
     @RequestMapping("/sygdPC")

src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxLjController.java

@@ -18,13 +18,15 @@ import org.springframework.web.bind.annotation.RestController;
 public class DmSygdMxLjController {
 
     public static void main(String[] agrs) {
-       double ljgs=12.0/8;
+        System.out.println((3.21!=0.0)&&("16,13".indexOf("12")>0));
-        System.out.println(ljgs);
+//       double ljgs=12.0/8;
-        int num= (int)ljgs;
+//        System.out.println(ljgs);
-
+//        int num= (int)ljgs;
-        num+=((ljgs-num)>0?2:1);
+//
-
+//        num+=((ljgs-num)>0?1:0);
-        System.out.println(num);
+//
+//        System.out.println(num);
+//        System.out.println(DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate("2023/08/01"),-num),"yyyy/MM/dd"));
 //        String a = "2023/08/20";
 //        String b = "2023/08/21";
 //        System.out.println(a.compareTo(b));
@@ -34,8 +36,8 @@ public class DmSygdMxLjController {
 //        String[] a={"船只",	"批量号",	"总段号",	"分段号",	"大组极重",	"总装部最新分段需求期",	"钢料需求",	"X大板",	"X数控件",	"X平铁",	"X压弯",	"X型材",	"X二次装T型材"};
 //        String[] a1={"dcCh","dcPl",	"zdh","dcFd","dzjz","zxfdxq",	"glxq",	"xdb",	"xskj,",
 //                "xpt,",	"xyw",	"xxc",	"xtxc",	};
-//        String[] b={"工序",	"跨位",	"产能单位",	"白班",	"白班",	"夜班",	"夜班",	"合计",	"白班",	"白班",	"划线夜班",	"划线夜班",	"合计",	"产能单位",	"零件加工工序",	"白班",	"白班",	"夜班",	"夜班",	"合计",	"产能单位",	"零件加工工序",	"白班",	"白班",	"夜班",	"夜班",	"合计",	"产能单位",	"零件加工工序",	"白班",	"白班",	"夜班",	"夜班",	"合计",	"产能单位"};
+//        String[] b={"套料图号",	"套料图名",	"加工跨",	"划线设备",	"划线产能",	"切割设备",	"切割产能",	"零件加工设备",	"设备产能",	"零件加工设备",	"设备产能",	"零件加工设备",	"设备产能",	"编辑人员",	"编辑日期"};
-//        String[] b1={"gx",	"kw",	"cndw",	"zxcn_bb",	"zdcn_bb",	"zxcn_yb",	"zdcn_yb",	"cnhj",	"zxcn_bb1",	"zdcn_bb1",	"zxcn_yb1",	"zdcn_yb1",	"cnhj1",	"cndw1",	"ljgx2",	"zxcn_bb2",	"zdcn_bb2",	"zxcn_yb2",	"zdcn_yb2",	"cnhj2",	"cndw2",	"ljgx3",	"zxcn_bb3",	"zdcn_bb3",	"zxcn_yb3",	"zdcn_yb3",	"cnhj3",	"cndw3",	"ljgx4",	"zxcn_bb4",	"zdcn_bb4",	"zxcn_yb4",	"zdcn_yb4",	"cnhj4",	"cndw4"};
+//        String[] b1={"tzbh",	"tzmc",	"kw",	"hxsb",	"hxcn",	"qgsb",	"qgcn",	"ljjgsb1",	"sbcn1",	"ljjgsb2",	"sbcn2",	"ljjgsb3",	"sbcn3",	"bjry",	"bjrq"};
 //        for (int i = 0; i < b.length; i++) {
 //            System.out.println("{ field: '"+b1[i]+"', title: '"+b[i]+"', width: 120, \n" +
 //                    " filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],\n" +

src/main/java/com/dsic/gj_erp/controller/sy/DmDepartController1.java

@@ -0,0 +1,91 @@
+package com.dsic.gj_erp.controller.sy;
+
+
+import com.dsic.gj_erp.annotation.AuthFunction;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.sy.DmDepart;
+import com.dsic.gj_erp.bean.sy.DmDepartIn;
+import com.dsic.gj_erp.service.sy.DmDepartService;
+import io.swagger.annotations.Authorization;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 部门表 前端控制器
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-23
+ */
+@RestController
+@RequestMapping("/api/sy/depart")
+public class DmDepartController1 {
+
+    @Resource
+    private DmDepartService dmDepartService;
+
+    /**
+     * 无参获取全部部门
+     * @return
+     */
+    @GetMapping("/getall")
+    public ResultBean<List<DmDepart>> getAll(){
+        return new ResultBean<List<DmDepart>>(this.dmDepartService.getAll());
+    }
+
+    /**
+     * 条件查询部门及其子部门
+     * @param dmDepart
+     * @return
+     */
+    @AuthFunction
+    @PostMapping("/getcon")
+    public ResultBean<List<DmDepart>> getByCondition(@RequestBody DmDepart dmDepart){
+        return new ResultBean<List<DmDepart>>(this.dmDepartService.getByCondition(dmDepart));
+    }
+
+    @AuthFunction
+    @PostMapping("/getcondefault")
+    public ResultBean<List<DmDepart>> getByConditionDefaultDepartCode(@RequestBody DmDepartIn dmDepart){
+        return new ResultBean<List<DmDepart>>(this.dmDepartService.getByConditionDefaultDepartCode(dmDepart));
+    }
+
+    @AuthFunction
+    @PostMapping("/getallparent")
+    public ResultBean<List<DmDepart>> getAllParent(){
+        return new ResultBean<>(this.dmDepartService.getAllParent());
+    }
+
+    @AuthFunction
+    @PostMapping("/getallchildren")
+    public ResultBean<List<DmDepart>> getAllChildren(){
+        return new ResultBean<>(this.dmDepartService.getAllChildren());
+    }
+
+    /**
+     * @Title
+     * @Description //根据参数不同查询部门
+     * @author xcs
+     * @updateAuthor xcs
+     * @Date 2021/5/12 10:26
+     * @version v1.0.0
+     * @exception
+     * @throws
+     * @return
+     **/
+    @ResponseBody
+    @RequestMapping("/selectall")
+    public ResultBean<List<DmDepart>> selectall(@RequestBody String[] map){
+       // System.out.println(map+"打印一下这个东西");
+        List<String>  ids = Arrays.asList(map);
+        return this.dmDepartService.selectDepartQuery(ids);
+
+    }
+
+
+}
+

src/main/java/com/dsic/gj_erp/controller/sy/DmEmployeeController1.java

@@ -0,0 +1,45 @@
+package com.dsic.gj_erp.controller.sy;
+
+
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.sy.DmEmployee;
+import com.dsic.gj_erp.service.sy.DmEmployeeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @version V1.0.0
+ * @Title: DmEmployeeController
+ * @Package com.dsic.xzerp.controller.sy
+ * @Description: 管系制造员工查询专用controller
+ * @author: 张恩铭
+ * @date: 2021/4/2 9:06
+ */
+@RestController
+@Api(tags = "管系制造员工查询专用controller")
+@RequestMapping("/api/sy/ygcx")
+public class DmEmployeeController1 {
+
+    @Resource
+    private DmEmployeeService dmEmployeeService;
+
+    @PostMapping("/getcon")
+    @ApiOperation("无like条件查询")
+    public ResultBean<List<DmEmployee>> getByCon(@RequestBody DmEmployee dmEmployee){
+        return new ResultBean<List<DmEmployee>>(this.dmEmployeeService.getByCondition(dmEmployee));
+    }
+
+    @PostMapping("/getcondefault")
+    @ApiOperation("特定like条件查询")
+    public ResultBean<List<DmEmployee>> getByConDefaultDeptCode(@RequestBody DmEmployee dmEmployee){
+        return new ResultBean<>(this.dmEmployeeService.getByConditionDefaultDepartCode(dmEmployee));
+    }
+
+}

src/main/java/com/dsic/gj_erp/controller/sy/SyDictController.java

@@ -0,0 +1,52 @@
+package com.dsic.gj_erp.controller.sy;
+
+
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.service.sy.SyDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-15
+ */
+@RestController
+@RequestMapping(value = "/api/sy/dict")
+public class SyDictController {
+    @Autowired
+    SyDictService syDictService;
+
+
+    @PostMapping(value = "/getTreeList")
+    public ResultBean getTreeList(@RequestBody Map<String, Object> params) {
+        return new ResultBean( syDictService.getTreeList(params));
+
+    }
+
+    @PostMapping(value = "/getTxTreeList")
+    public ResultBean getTxTreeList(@RequestBody Map<String, Object> params) {
+        return new ResultBean( syDictService.getTxTreeList(params));
+
+    }
+
+    @PostMapping(value = "/getTreeListForQKFL")
+    public ResultBean getTreeListForQKFL(@RequestBody Map<String, Object> params) {
+        return new ResultBean( syDictService.getTreeListForQKFL(params));
+
+    }
+
+
+
+
+
+}
+

src/main/java/com/dsic/gj_erp/controller/sy/SyDictItemController.java

@@ -0,0 +1,91 @@
+package com.dsic.gj_erp.controller.sy;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.sy.SyDictItem;
+import com.dsic.gj_erp.service.sy.SyDictItemService;
+import com.dsic.gj_erp.util.CacheConstant;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-16
+ */
+@RestController
+@RequestMapping(value = "/api/sy/dict")
+public class SyDictItemController {
+
+    @Resource
+    SyDictItemService syDictItemService;
+
+    @PostMapping(value = "/getList")
+    public ResultBean getList(@RequestBody Map<String, Object> params) {
+        QueryWrapper<SyDictItem> queryWrapper = new QueryWrapper<SyDictItem>();
+        if (!StringUtils.isBlank((String)params.get("name"))){
+            queryWrapper.eq("dict_code",params.get("name"));
+        }
+        return  new  ResultBean(syDictItemService.list(queryWrapper));
+    }
+
+    /**
+     * 获取以dictCode分组的字典数据
+     */
+    @GetMapping("mapList")
+    public ResultBean<?> mapList(){
+        List<SyDictItem> list=syDictItemService.list();
+        Map<String,List<SyDictItem>> map=list.stream()
+                .collect(Collectors.groupingBy(SyDictItem::getDictCode));
+        return new ResultBean<>(map);
+    }
+
+    @PostMapping(value = "/add")
+    @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true)
+    public ResultBean getList(@RequestBody List<SyDictItem> syDictItem) {
+        return  new  ResultBean(syDictItemService.saveBatch(syDictItem));
+    }
+
+    @PostMapping(value = "/del")
+    @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true)
+    public ResultBean del(@RequestBody List<String> delArr) {
+        syDictItemService.removeByIds(delArr);
+       return  new  ResultBean();
+    }
+
+    @PostMapping(value = "/update")
+    @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
+    public ResultBean update(@RequestBody List<SyDictItem> syDictItem) {
+        syDictItemService.updateBatchById(syDictItem);
+        return  new  ResultBean();
+    }
+
+    @PostMapping("/getbycode")
+    public ResultBean getByCode(@RequestBody SyDictItem syDictItem){
+        return new ResultBean(this.syDictItemService.getByCode(syDictItem));
+    }
+
+    /**
+     * 根据dictCode查询,itemCode右模糊查询
+     */
+    @PostMapping("/getByDictCodeWithItemCodeRightLike")
+    public ResultBean getByDictCodeWithItemCodeRightLike(@RequestBody SyDictItem syDictItem){
+        List<SyDictItem> list=this.syDictItemService.list(new QueryWrapper<SyDictItem>()
+                .eq("dict_code",syDictItem.getDictCode())
+                .likeRight("item_code",syDictItem.getItemCode()));
+        return new ResultBean(list);
+    }
+
+}
+

src/main/java/com/dsic/gj_erp/controller/sy/SyLogController.java

@@ -0,0 +1,100 @@
+package com.dsic.gj_erp.controller.sy;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dsic.gj_erp.annotation.AuthFunction;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.sy.DmPipeSystem;
+import com.dsic.gj_erp.bean.sy.SyLog;
+import com.dsic.gj_erp.service.sy.SyLogService;
+import com.dsic.gj_erp.util.IPUtils;
+import io.swagger.annotations.Authorization;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.apache.commons.lang3.StringUtils;
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 系统日志表 前端控制器
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-04-08
+ */
+
+@RestController
+@RequestMapping(value = "/api/sy/syLog")
+public class SyLogController {
+
+    @Autowired
+    SyLogService syLogService;
+
+    @AuthFunction
+    @PostMapping(value = "/add")
+    public ResultBean getList(HttpServletRequest httpRequest , @RequestBody SyLog syLog) {
+
+        syLog.setIp(IPUtils.getIpAddr(httpRequest));
+        syLog.setComputerName(System.getenv().get("USERNAME"));
+        syLog.setUserCode((String) httpRequest.getAttribute("yhdm"));
+        syLog.setUserName((String) httpRequest.getAttribute("username"));
+        SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");//设置日期格式
+        syLog.setCreateTime(df.format(new Date()));
+        syLogService.save(syLog);
+        return  new  ResultBean();
+    }
+
+
+    @PostMapping("/getList")
+    public ResultBean  getList(@RequestBody Map<String, Object> paramMap){
+         IPage<SyLog> page = new Page<>((Integer)paramMap.get("pageNo"), (Integer)paramMap.get("pageSize"));
+        QueryWrapper qw = new QueryWrapper<DmPipeSystem>();
+
+        Map syLog = (Map)paramMap.get("syLog");
+        qw.orderByDesc("create_time");
+        if (!StringUtils.isBlank((String)syLog.get("userName"))){
+            qw.like("user_name",syLog.get("userName"));
+
+        }
+        if (!StringUtils.isBlank((String)syLog.get("systemCode"))){
+            qw.like("system_code",syLog.get("systemCode"));
+
+        }
+        if (!StringUtils.isBlank((String)syLog.get("content"))){
+            qw.like("content",syLog.get("content"));
+            //qw.apply("left(content,2)=2");
+        }
+        if (!StringUtils.isBlank((String)syLog.get("ks"))){
+            qw.apply("left(create_time,10)>='"+syLog.get("ks")+"'");
+        }
+        if (!StringUtils.isBlank((String)syLog.get("js"))){
+            qw.apply("left(create_time,10)<='"+syLog.get("js")+"'");
+        }
+
+      //  List list = syLogService.list(qw);
+     IPage<SyLog> page1 = syLogService.page(page, qw);
+
+
+        //  System.out.println(page1);
+        return new ResultBean(page1);
+    }
+
+    @PostMapping(value = "/del")
+    public ResultBean del(@RequestBody List<String> delArr) {
+        syLogService.removeByIds(delArr);
+        return  new  ResultBean();
+    }
+
+
+}
+

src/main/java/com/dsic/gj_erp/mapper/DmDepartMapper.java

@@ -0,0 +1,31 @@
+package com.dsic.gj_erp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.sy.DmDepart;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 部门表 Mapper 接口
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-23
+ */
+@Mapper
+public interface DmDepartMapper extends BaseMapper<DmDepart> {
+    @Select(value = {"<script>"
+            + "select depart_code,depart_name from dm_depart "
+            + " where  depart_code in  "
+            + "<foreach collection='ids' item='id' open='(' separator=',' close=')'>"
+            +"#{id}"
+            +"</foreach>"
+            + "</script>"})
+    List<DmDepart> selectDepartQuery (@Param("ids") List<String>  ids);
+
+}

src/main/java/com/dsic/gj_erp/mapper/DmEmployeeMapper.java

@@ -0,0 +1,18 @@
+package com.dsic.gj_erp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.sy.DmEmployee;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @version V1.0.0
+ * @Title: DmEmployeeMapper
+ * @Package com.dsic.xzerp.dao.sy
+ * @Description: 管系制造员工mapper
+ * @author: 张恩铭
+ * @date: 2021/4/2 9:01
+ */
+@Mapper
+public interface DmEmployeeMapper extends BaseMapper<DmEmployee> {
+}

src/main/java/com/dsic/gj_erp/mapper/SyDictItemMapper.java

@@ -0,0 +1,30 @@
+package com.dsic.gj_erp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.sy.SyDictItem;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-16
+ */
+@Mapper
+public interface SyDictItemMapper extends BaseMapper<SyDictItem> {
+
+
+    String queryTableDictTextByKey(@Param("table") String table, @Param("text") String text, @Param("code") String code, @Param("key") String key);
+    String queryTableDictTextByKeySys(@Param("table") String table, @Param("text") String text, @Param("code") String code, @Param("key") String key,@Param("code1") String code1, @Param("key1") String key1);
+    String queryDictTextByKey(@Param("code") String code,@Param("key") String key);
+
+    @MapKey("itemCode")
+    Map<String,SyDictItem> getCodeToMap(String dictCode);
+}

src/main/java/com/dsic/gj_erp/mapper/SyDictMapper.java

@@ -0,0 +1,19 @@
+package com.dsic.gj_erp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.sy.SyDict;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-15
+ */
+@Mapper
+public interface SyDictMapper extends BaseMapper<SyDict> {
+
+}

src/main/java/com/dsic/gj_erp/mapper/SyLogMapper.java

@@ -0,0 +1,17 @@
+package com.dsic.gj_erp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.sy.SyLog;
+
+/**
+ * <p>
+ * 系统日志表 Mapper 接口
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-04-08
+ */
+public interface SyLogMapper extends BaseMapper<SyLog> {
+
+}

src/main/java/com/dsic/gj_erp/mapper/SyuserMapper.java

@@ -11,4 +11,61 @@ import java.util.Map;
 public interface SyuserMapper {
 
     List<Map> getUserMenu(String usercode, String systemcode);
+
+    //------------------------------------------------------
+    List<Map> getDepartList();
+
+    List<Map> getRoleList();
+
+    Integer addRole(Map role);
+
+    Integer deleteRole(String role_code);
+
+    Integer updateRole(Map role);
+
+    List<Map> getRoleListByUser(String user_code);
+
+    Integer addRoleForUser(Map<String, Object> user_role);
+
+    Integer deleteRoleForUser(Map<String, Object> user_role);
+
+    List<Map> getSystemList();
+
+    List<Map> getMenuList();
+
+    List<Map> getUserListByMenu(int menu_id);
+
+    List<Map> getInstitutionList();
+
+    List<Map> getUserListByRole(String role_code);
+
+    List<Map> getInstitutionListByRole(String role_code);
+
+    List<Map> getSystemListByRole(String role_code);
+
+    Integer addRoleForInstitution(Map<String, Object> institution_role);
+
+    Integer deleteRoleForInstitution(Map<String, Object> institution_role);
+
+    Integer addRoleForSystem(Map<String, Object> system_role);
+
+    Integer deleteRoleForSystem(Map<String, Object> system_role);
+
+
+    List<Map> getMenuListByRole(String role_code);
+
+    void addRoleForMenu(Map<String, Object> menu_role);
+
+    void deleteRoleForMenu(Map<String, Object> menu_role);
+
+    void addFingerprintResult(String uuid, String fingerprint, String user_code);
+
+    String getCodeByUuid(String uuid);
+
+    Integer updateFingerprint(String uuid, String fingerprint);
+    Integer updateFingerprint1(String userCode, String fingerprint);
+    Integer updateFingerprint2(String userCode, String fingerprint);
+    Integer updateFingerprint3(String userCode, String fingerprint);
+
+    Map<String,Object> getUserInfo(Map<String,Object> map);
 }

src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbcnpMapper.java

@@ -13,5 +13,5 @@ import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
  * @since 2023-09-15
  */
 public interface EmSbcnpMapper extends BaseMapper<EmSbcnp> {
-
+    int test();
 }

src/main/java/com/dsic/gj_erp/service/MyCacheInterface.java

@@ -0,0 +1,5 @@
+package com.dsic.gj_erp.service;
+
+public interface MyCacheInterface {
+    void refreshRedis();
+}

src/main/java/com/dsic/gj_erp/service/cache/RedisCacheKeyConfig.java

@@ -0,0 +1,9 @@
+package com.dsic.gj_erp.service.cache;
+
+public interface RedisCacheKeyConfig {
+    //船只信息缓存,对应DmProject
+    String PROJECT_KEY="ZX_ERP::PROJECT";
+
+    //部门缓存
+    String DEPT_KEY="ZX_ERP::DEPT";
+}

src/main/java/com/dsic/gj_erp/service/cache/package-info.java

@@ -0,0 +1,2 @@
+package com.dsic.gj_erp.service.cache;
+//缓存读取

src/main/java/com/dsic/gj_erp/service/jcsj/EmSbcnpService.java

@@ -22,9 +22,6 @@ import java.util.Map;
 public interface EmSbcnpService extends IService<EmSbcnp> {
     List<EmSbcnp> getList(JSONObject json);
 
-    void save(List<EmSbcnp> emSbcnps);
-
-    void update(List<EmSbcnp> emSbcnps);
 
     void delete(List<EmSbcnp> emSbcnps);
 

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java

@@ -33,24 +33,17 @@ public class EmSbcnpServiceImpl extends ServiceImpl<EmSbcnpMapper, EmSbcnp> impl
     @Override
     public List<EmSbcnp> getList(JSONObject json) {
         QueryWrapper<EmSbcnp> queryWrapper=new QueryWrapper<>();
-        if(StringUtils.isNotEmpty(json.getString("kw"))){
+        if(StringUtils.isNotEmpty(json.getString("tzbh"))){
-            queryWrapper.eq("KW",json.getString("kw"));
+            queryWrapper.eq("tzbh",json.getString("tzbh"));
         }
-        List<EmSbcnp> emSbjbbs=emSbcnpMapper.selectList(queryWrapper.orderByAsc("kw,gx"));
+//        for (int i = 0; i < 80; i++) {
-        return emSbjbbs;
+//            emSbcnpMapper.test();
-    }
+//        }
 
-    @Override
+        List<EmSbcnp> emSbjbbs=emSbcnpMapper.selectList(queryWrapper.orderByDesc("kw,tzbh,zl,jgsx"));
-    public void save(List<EmSbcnp> emSbcnps) {
+        return emSbjbbs;
-//        List<EmSbcnp> saveList= emSbcnps.stream().filter(emSbcnp -> StringUtils.isNotEmpty(emSbcnp.getSbbh())).collect(Collectors.toList());
-        saveBatch(emSbcnps);
     }
 
-    @Override
-    public void update(List<EmSbcnp> emSbcnps) {
-        //emSbcnpRepository.saveAll(emSbcnps);
-        updateBatchById(emSbcnps);
-    }
 
     @Override
     public void delete(List<EmSbcnp> emSbcnps) {

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java

@@ -1,16 +1,12 @@
 package com.dsic.gj_erp.service.jhgk.impl;
 
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jhgk.DmQfxq;
-import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
-import com.dsic.gj_erp.bean.jhgk.excel.QfExcel;
 import com.dsic.gj_erp.mapper.jhgk.DmQfxqMapper;
 import com.dsic.gj_erp.service.jhgk.DmQfxqService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
@@ -18,7 +14,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java

@@ -12,6 +12,7 @@ import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.bean.jcsj.DmBom;
 import com.dsic.gj_erp.bean.jcsj.DmCzplpNew;
 import com.dsic.gj_erp.bean.jcsj.EmGcrl;
+import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
 import com.dsic.gj_erp.bean.jcsj.excel.PlExcel;
 import com.dsic.gj_erp.bean.jhgk.*;
 import com.dsic.gj_erp.bean.jhgk.dto.*;
@@ -20,6 +21,7 @@ import com.dsic.gj_erp.mapper.jcsj.EmGcrlMapper;
 import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
 import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
 import com.dsic.gj_erp.service.jcsj.DmCzplpNewService;
+import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
 import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
 import com.dsic.gj_erp.service.jhgk.DmSygdService;
 import com.dsic.gj_erp.service.jhgk.DmTzjhService;
@@ -57,6 +59,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
     private DmTzjhService tzjhService;
     @Resource
     private DmSygdMxLjServiceImpl ljService;
+    @Resource
+    private EmSbcnpService sbcnpService;
 
     /**
      * 采购计划到货情况
@@ -77,16 +81,17 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
     public ResultBean sygdPC() {
         //todo 重复导入（三月滚动计划）的数据处理
         //零件 删除
-        String begin=DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01");
+//        String begin=DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01");
-        String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),3)),"yyyy/MM/dd");
+//        String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),3)),"yyyy/MM/dd");
-//        String begin="2023/08/01";
+        String begin="2023/08/01";
-//        String end ="2023/10/31";
+        String end  ="2023/10/31";
         //todo 零件
         ljService.remove(new QueryWrapper<DmSygdMxLj>().between("xzglxq",begin,end));
         //todo 三月滚动明细
        this.remove(new QueryWrapper<DmSygdMx>().between("jssj",begin,end));
        //todo 三月滚动计划
        sygdService.remove(new QueryWrapper<DmSygd>().between("sl_sj",begin,end));
+
         baseMapper.getLjxx(begin,end);
         List<DmSygdMxLj> ljList = ljService.list(new QueryWrapper<DmSygdMxLj>().between("xzglxq",begin,end));
 
@@ -100,25 +105,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
         //qgjssj 切割完成期（最晚）
         //判断标识 零件数量*定额工时*长度=加工时长 累计加工时长 需求日期-累计加工时长=切割完成期（最晚）
         //todo 有标识 无定额-->设备产能中同跨位零件加工定额 无-->通用零件加工定额
-//        ljList.forEach(l->{
+
-//            double ljgs=0.0;
-//            if(StrUtil.isNotEmpty(l.getPkbs())){
-//                ljgs+=(l.getLjsl()*l.getPkcd())/l.getPkgs();
-//
-//            }
-//            if(StrUtil.isNotEmpty(l.getDmbs())){
-//                ljgs+=(l.getLjsl()*l.getDmcd())/l.getDmgs();
-//            }
-//            if(StrUtil.isNotEmpty(l.getQbs())){
-//                ljgs+=l.getLjsl()/l.getQgs();
-//            }
-////            8小时
-//            ljgs=ljgs/8;
-//            int num= (int)ljgs;
-//            num+=(ljgs-num)>0?2:1;
-//            l.setQgjssj(DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(l.getXzglxq()),num),"yyyy/MM/dd"));
-//            ljService.updateById(l);
-//        });
 
         //2.根据
         List<DmSygdMx> mxList = baseMapper.getMx(begin,end);
@@ -136,43 +123,122 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
      * @param list
      */
     public void ypc(List<DmSygdMx> list) {
+      Map<String,List<DmSygdMx>> mxMap=  list.stream().collect(Collectors.groupingBy(x -> x.getKw()+x.getZl()));
+        //加工工序list
+      List<EmSbcnp> sbcnp= sbcnpService.list(new QueryWrapper<EmSbcnp>().orderByDesc("tzbh,zl,jgsx"));
+      Map<String,List<EmSbcnp>> cnMap= sbcnp.stream().collect(Collectors.groupingBy(l->l.getTzbh()+l.getZl()));
+      for (String ljkey:mxMap.keySet()){
+          for (String cnkey:cnMap.keySet()){
+              if(ljkey.equals(cnkey)){
+                  List<DmSygdMx> mxs= mxMap.get(ljkey);
+                  List<EmSbcnp> cns= cnMap.get(cnkey);
+                  mxs.forEach(l->{
+                      double ljgs=0.0;
+                      for (EmSbcnp cn : cns) {
+                          // 号料 手工切割 倒棱 切端头 自由边 预组
+                          // 曲 （个）
+                          if(StrUtil.isNotEmpty(l.getQbs())&&cn.getGx().equals("18")){
+                              ljgs+= l.getLjsl()/cn.getDegs();
+                              l.setQjgrq(getRq(ljgs,l.getJssj()));
+                          }
+                          // 打磨
+                          if(ObjectUtil.isNotEmpty(l.getDmcd())&&("16,13".indexOf(cn.getGx())>0)){
+                              ljgs+= l.getDmcd() /cn.getDegs();
+                              l.setDmrq(getRq(ljgs,l.getJssj()));
+                          }
+                          // 坡口
+                          if(ObjectUtil.isNotEmpty(l.getPkcd())&&("08,10".indexOf(cn.getGx())>0)){
+                              ljgs+= l.getPkcd() /cn.getDegs();
+                              l.setPkrq(getRq(ljgs,l.getJssj()));
+                          }
+
+                          if("03,04,05,07".indexOf(cn.getGx())>0){
+                              ljgs+= l.getQgcd() /cn.getDegs();
+                              l.setQgrq(getRq(ljgs,l.getJssj()));
+                          }
+                          // 划线
+                          if(cn.getGx().equals("01")){
+                              ljgs+= l.getHxcd() /cn.getDegs();
+                              l.setHxrq(getRq(ljgs,l.getJssj()));
+                          }
+                          //上料
+                          if(cn.getGx().equals("19")){
+                              ljgs+= l.getHxcd() /cn.getDegs();
+                              l.setSlrq(getRq(ljgs,l.getJssj()));
+                          }
+                          //抛丸
+                          if(cn.getGx().equals("20")){
+                              ljgs+= l.getHxcd() /cn.getDegs();
+                              l.setPkrq(getRq(ljgs,l.getJssj()));
+                          }
+                          //理料
+                          if(cn.getGx().equals("21")){
+                              ljgs+= l.getHxcd() /cn.getDegs();
+                              l.setLlrq(getRq(ljgs,l.getJssj()));
+                          }
+                      }
+                      this.save(l);
+                  });
+
+              }
+          }
+      }
+//********************************************************************
         //1.根据组立结束时间排序，决定生产顺序
-        list = list.stream().sorted(Comparator.comparing(DmSygdMx::getJssj, Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
+//        list = list.stream().sorted(Comparator.comparing(DmSygdMx::getQgjssj, Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
-        double days=list.size()/266.0;
+//        double days=list.size()/266.0;
-        int day=(int)days;
+//        int day=(int)days;
-        day+=((days-day)>0?1:0);
+//        day+=((days-day)>0?1:0);
-        //2.未来工厂日历信息
+//        //2.未来工厂日历信息
-        String begin=list.get(0).getJssj();
+//        String begin=list.get(0).getJssj();
-        String end =DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(begin),day),"yyyy/MM/dd");
+//        String end =DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(begin),day),"yyyy/MM/dd");
-        List<EmGcrl> gcrlList = gcrlMapper.selectList(new QueryWrapper<EmGcrl>()
+//        List<EmGcrl> gcrlList = gcrlMapper.selectList(new QueryWrapper<EmGcrl>()
-                                                      .between("gl",begin,end)
+//                                                      .between("gl",begin,end)
-                                                     .orderByAsc("gl"));
+//                                                     .orderByAsc("gl"));
         //3.预排产
-        //TODO 假设：产能测算266.9；又套料图需当天完成
+        // 假设：产能测算266.9；又套料图需当天完成
-        for (int i = 0; i < gcrlList.size(); i++) {
+//        for (int i = 0; i < gcrlList.size(); i++) {
-            for (int j = 0; j < 266; j++) {
+//            for (int j = 0; j < 266; j++) {
-                int index = 266 * i + j;
+//                int index = 266 * i + j;
-                if (list.size() > index) {
+//                if (list.size() > index) {
-                   String sl= DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(gcrlList.get(i).getGl()),-1),"yyyy/MM/dd");
+//                   String sl= DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(gcrlList.get(i).getGl()),-1),"yyyy/MM/dd");
-                    list.get(index).setSlrq(sl);
+//                    list.get(index).setSlrq(sl);
-                    list.get(index).setPwrq(sl);
+//                    list.get(index).setPwrq(sl);
-                    list.get(index).setPw("1抛");
+//                    list.get(index).setPw("1抛");
-                    list.get(index).setHxrq(gcrlList.get(i).getGl());
+//                    list.get(index).setHxrq(gcrlList.get(i).getGl());
-                    list.get(index).setQgrq(gcrlList.get(i).getGl());
+//                    list.get(index).setQgrq(gcrlList.get(i).getGl());
-                    list.get(index).setXxr(gcrlList.get(i).getXxr());
+//                    list.get(index).setXxr(gcrlList.get(i).getXxr());
-                } else {
+//                } else {
-                    j = 266;
+//                    j = 266;
-                    i = gcrlList.size();
+//                    i = gcrlList.size();
-                }
+//                }
-            }
+//            }
-            //
+//            //
-        }
+//        }
-        this.saveBatch(list);
+
+//        this.saveBatch(list);
     }
 
+    public String getRq(Double gs,String rq){
+        double ts=gs/8;
+        int num= (int)ts;
+        num+=(ts-num)>0?1:0;
+        return  DateUtil.format(DateUtil.offsetDay(DateUtil.parseDate(rq),-num),"yyyy/MM/dd");
+    }
+
+    public void pp(List<DmSygdMx> list,List<EmSbcnp> sbcnp){
+//        1.零件按照交货时间排序，从后到前；按日期分组
+//        2.时间倒序，排加工时间
+        //套料图类型一致
+        //日期从后往前
+        //产能   sbcnp.get(0).getDegs()*8
+        //循环日期 工厂日历 最后一天
+
+
+
+    }
     /**
      * 提取线表信息
-     *
      * @param list
      * @return
      */
@@ -183,7 +249,6 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
         //批量表重量 中日程重量
         //明细 按船号 月份 分组 计算重量 排产重量
 
-
         List<DmXbjh> xbjhs = xbService.list(new QueryWrapper<DmXbjh>()
                 .eq("nf", year)
                 .ne("zl", 0)
@@ -309,8 +374,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
                 BigDecimal hx_cd = new BigDecimal(0);
                 BigDecimal qg_cd = new BigDecimal(0);
                 for (DmSygdMx mx : list1) {
-                    hx_cd = hx_cd.add(ObjectUtil.isEmpty(mx.getHxcd()) ? new BigDecimal(0) : mx.getHxcd());
+                    hx_cd = hx_cd.add(ObjectUtil.isEmpty(mx.getHxcd()) ? new BigDecimal(0) : new BigDecimal(mx.getHxcd()));
-                    qg_cd = qg_cd.add(ObjectUtil.isEmpty(mx.getQgcd()) ? new BigDecimal(0) : mx.getQgcd());
+                    qg_cd = qg_cd.add(ObjectUtil.isEmpty(mx.getQgcd()) ? new BigDecimal(0) : new BigDecimal(mx.getQgcd()));
                 }
 //                kwdto.setHx_cd(hx_cd);
 //                kwdto.setQg_cd(qg_cd);

src/main/java/com/dsic/gj_erp/service/sy/DmDepartService.java

@@ -0,0 +1,30 @@
+package com.dsic.gj_erp.service.sy;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.sy.DmDepart;
+import com.dsic.gj_erp.bean.sy.DmDepartIn;
+import com.dsic.gj_erp.service.MyCacheInterface;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 部门表 服务类
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-23
+ */
+public interface DmDepartService extends IService<DmDepart>, MyCacheInterface {
+    List<DmDepart> getAll();
+    List<DmDepart> getByCondition(DmDepart dmDepart);
+    List<DmDepart> getByConditionDefaultDepartCode(DmDepartIn dmDepart);
+    List<DmDepart> getAllParent();
+    List<DmDepart> getAllChildren();
+    ResultBean<Integer> addDepart(DmDepart[] dmDeparts);
+    ResultBean<Integer> updateDepart(DmDepart[] dmDeparts);
+    ResultBean<Integer> delDepart(DmDepart[] dmDeparts);
+    ResultBean<List<DmDepart>> selectDepartQuery (List<String> params);
+}

src/main/java/com/dsic/gj_erp/service/sy/DmEmployeeService.java

@@ -0,0 +1,25 @@
+package com.dsic.gj_erp.service.sy;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.sy.DmEmployee;
+
+import java.util.List;
+
+/**
+ * @version V1.0.0
+ * @Title: DmEmployeeService
+ * @Package com.dsic.xzerp.service.sy
+ * @Description: 管系制造员工service
+ * @author: 张恩铭
+ * @date: 2021/4/2 9:04
+ */
+public interface DmEmployeeService extends IService<DmEmployee> {
+    List<DmEmployee> getAll();
+    List<DmEmployee> getByCondition(DmEmployee dmEmployee);
+    List<DmEmployee> getByConditionDefaultDepartCode(DmEmployee dmEmployee);
+    ResultBean<Integer> addEmployee(DmEmployee[] dmEmployees);
+    ResultBean<Integer> updateEmployee(DmEmployee[] dmEmployees);
+    ResultBean<Integer> delEmployee(DmEmployee[] dmEmployees);
+}

src/main/java/com/dsic/gj_erp/service/sy/SYService.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dsic.gj_erp.bean.sy.*;
 import com.dsic.gj_erp.dao.sy.*;
+import com.dsic.gj_erp.mapper.SyuserMapper;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -18,12 +19,15 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.PostConstruct;
 import javax.persistence.EntityManager;
+import javax.xml.bind.DatatypeConverter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.alibaba.excel.util.StringUtils.isEmpty;
+
 /**
  * 系统安全子系统处理逻辑
  */
@@ -56,6 +60,8 @@ public class SYService {
     DmBhzybRepository dmBhzybRepository;
     @Autowired
     private EntityManager entityManager;
+    @Autowired
+    private SyuserMapper syuserMapper;
     private JPAQueryFactory queryFactory;
 
     @PostConstruct
@@ -426,6 +432,119 @@ public class SYService {
         }
         return dmZhbmp;
     }
+//    ----------------------------------------------------------------
+public List<Map> getDepartList() {
+    return syuserMapper.getDepartList();
+}
+
+
+    public Integer addRole(Map role) {
+        return syuserMapper.addRole(role);
+    }
+
+    public Integer deleteRole(String role_code) {
+        return syuserMapper.deleteRole(role_code);
+    }
+
+    public Integer updateRole(Map role) {
+        return syuserMapper.updateRole(role);
+    }
+
+    public List<Map> getRoleList() {
+        return syuserMapper.getRoleList();
+    }
+
+    public List<Map> getRoleListByUser(String user_code) {
+        return syuserMapper.getRoleListByUser(user_code);
+    }
+
+
+    public void addRoleForUser(List<Map<String, Object>> list) {
+        for (Map map : list) {
+            syuserMapper.addRoleForUser(map);
+        }
+    }
+
+    public void deleteRoleForUser(List<Map<String, Object>> list) {
+        for (Map map : list) {
+            syuserMapper.deleteRoleForUser(map);
+        }
+    }
+
+
+    public List<Map> getSystemList() {
+        return syuserMapper.getSystemList();
+    }
+
+    public List<Map> getMenuList() {
+        return syuserMapper.getMenuList();
+    }
+
+    public List<Map> getUserListByMenu(int menu_id) {
+        return syuserMapper.getUserListByMenu(menu_id);
+    }
+
+
+    public List<Map> getInstitutionList() {
+        return syuserMapper.getInstitutionList();
+    }
+
+
+    public List<Map> getUserListByRole(String role_code) {
+        return syuserMapper.getUserListByRole(role_code);
+    }
+
+
+    public List<Map> getInstitutionListByRole(String role_code) {
+        return syuserMapper.getInstitutionListByRole(role_code);
+    }
+
+    public List<Map> getSystemListByRole(String role_code) {
+        return syuserMapper.getSystemListByRole(role_code);
+    }
+
+    public void addRoleForInstitution(List<Map<String, Object>> paramList) {
+        for (Map map : paramList) {
+            syuserMapper.addRoleForInstitution(map);
+        }
+    }
+
+    public void deleteRoleForInstitution(List<Map<String, Object>> paramList) {
+        for (Map map : paramList) {
+            syuserMapper.deleteRoleForInstitution(map);
+        }
+    }
+
+
+    public void addRoleForSystem(List<Map<String, Object>> paramList) {
+        for (Map map : paramList) {
+            syuserMapper.addRoleForSystem(map);
+        }
+    }
+
+    public void deleteRoleForSystem(List<Map<String, Object>> paramList) {
+        for (Map map : paramList) {
+            syuserMapper.deleteRoleForSystem(map);
+        }
+    }
+
+
+    public List<Map> getMenuListByRole(String role_code) {
+        return syuserMapper.getMenuListByRole(role_code);
+    }
+
+    public void addRoleForMenu(List<Map<String, Object>> paramList) {
+        for (Map map : paramList) {
+            syuserMapper.addRoleForMenu(map);
+        }
+    }
+
+    public void deleteRoleForMenu(List<Map<String, Object>> paramList) {
+        for (Map map : paramList) {
+            syuserMapper.deleteRoleForMenu(map);
+        }
+    }
+
 
 
 }

src/main/java/com/dsic/gj_erp/service/sy/SyDictItemService.java

@@ -0,0 +1,28 @@
+package com.dsic.gj_erp.service.sy;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.sy.SyDictItem;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-16
+ */
+
+public interface SyDictItemService extends IService<SyDictItem> {
+
+    public String translateDictFromTable(String table, String text, String code, String key);
+    public String translateDict(String code, String key);
+    public String translateDictFromTableByKey(String table, String text, String code, String key,String code1, String key1);
+    public List<SyDictItem> getByCode(SyDictItem syDictItem);
+    public   List<Map<String, Object>> getCodeByString(String code);
+
+    public Map<String,SyDictItem> getCodeToMap(String dictCode);
+
+}

src/main/java/com/dsic/gj_erp/service/sy/SyDictService.java

@@ -0,0 +1,29 @@
+package com.dsic.gj_erp.service.sy;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.sy.SyDict;
+import com.dsic.gj_erp.bean.tree.ProjectTreeVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-15
+ */
+
+public interface SyDictService extends IService<SyDict> {
+
+    public List<ProjectTreeVo> getTreeList(Map<String, Object> params);
+    public List<ProjectTreeVo> getTxTreeList(Map<String, Object> params);
+    public List<ProjectTreeVo> getTreeListForQKFL(Map<String, Object> params);
+
+    //public Map getBase(Map map);
+
+
+}

src/main/java/com/dsic/gj_erp/service/sy/SyLogService.java

@@ -0,0 +1,17 @@
+package com.dsic.gj_erp.service.sy;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.sy.SyLog;
+
+/**
+ * <p>
+ * 系统日志表 服务类
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-04-08
+ */
+public interface SyLogService extends IService<SyLog> {
+
+}

src/main/java/com/dsic/gj_erp/service/sy/impl/DmDepartServiceImpl.java

@@ -0,0 +1,240 @@
+package com.dsic.gj_erp.service.sy.impl;
+
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.sy.DmDepart;
+import com.dsic.gj_erp.bean.sy.DmDepartIn;
+import com.dsic.gj_erp.mapper.DmDepartMapper;
+import com.dsic.gj_erp.service.cache.RedisCacheKeyConfig;
+import com.dsic.gj_erp.service.sy.DmDepartService;
+import com.dsic.gj_erp.util.ConditionSelect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 部门表 服务实现类
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-23
+ */
+@Service
+public class DmDepartServiceImpl extends ServiceImpl<DmDepartMapper, DmDepart> implements DmDepartService {
+
+    @Resource
+    private DmDepartMapper dmDepartMapper;
+
+    private HashMap<String, String> departBm = new HashMap<String, String>(){{
+        put("DY", "03");
+        put("GJ", "02");
+        put("TX", "01");
+        put("QC", "06");
+    }};
+
+    /**
+     * 无参查询所有部门
+     * @author 张恩铭
+     * @return
+     */
+    @Override
+    public List<DmDepart> getAll() {
+        return this.dmDepartMapper.selectList(null);
+    }
+
+    /**
+     * 根据部门号条件查询部门及其子部门
+     * @author 张恩铭
+     * @param dmDepart
+     * @return
+     */
+    @Override
+    public List<DmDepart> getByCondition(DmDepart dmDepart) {
+        ConditionSelect<DmDepart> conditionSelect = new ConditionSelect<>(dmDepart, new QueryWrapper<>(), dmDepartMapper);
+        return conditionSelect.getResultByLikeRight();
+    }
+
+    /**
+     * 部门号模糊查询其他条件指定查询
+     * @param dmDepart
+     * @return
+     */
+    @Override
+    public List<DmDepart> getByConditionDefaultDepartCode(DmDepartIn dmDepart) {
+//        System.out.println(dmDepart);
+//        VoToEntity<DmDepartIn, DmDepart> voToEntity = new VoToEntity<>(dmDepart, new DmDepart());
+//        DmDepart eneity = voToEntity.getEneity();
+//        boolean flag = false;
+//        if(dmDepart.getDepartCode().length() >= 2){
+//            for (String key : departBm.keySet()) {
+//                if (dmDepart.getZxtbm().equals(key)){
+//                    flag = true;
+//                    break;
+//                }
+//            }
+//            if (flag){
+//                return getByCondition(eneity);
+//            }else{
+//                eneity.setDepartCode(departBm.get(dmDepart.getZxtbm()));
+//                return getByCondition(eneity);
+//            }
+//        }else {
+//            eneity.setDepartCode(departBm.get(dmDepart.getZxtbm()));
+//            return getByCondition(eneity);
+//        }
+            QueryWrapper<DmDepart> qw =new QueryWrapper<>();
+            qw.eq("parent_code",dmDepart.getParentCode());
+          if(StringUtils.isNotBlank(dmDepart.getDepartCode())){
+            qw.eq("depart_code",dmDepart.getDepartCode());
+          }
+        if(StringUtils.isNotBlank(dmDepart.getDepartCode())){
+            qw.eq("depart_code",dmDepart.getDepartCode());
+        }
+        if(StringUtils.isNotBlank(dmDepart.getManuType())){
+            qw.eq("manu_type",dmDepart.getManuType());
+        }
+        if(StringUtils.isNotBlank(dmDepart.getDepartType())){
+            qw.eq("depart_type",dmDepart.getDepartType());
+        }
+        if(StringUtils.isNotBlank(dmDepart.getDepartAttr())){
+            qw.eq("depart_attr",dmDepart.getDepartAttr());
+        }
+        qw.eq(StrUtil.isNotEmpty(dmDepart.getManuFlag()),"manu_flag",dmDepart.getManuFlag());
+            return this.list(qw);
+    }
+
+    /**
+     * 查询所有主部门
+     * @author 张恩铭
+     * @return
+     */
+    @Override
+    public List<DmDepart> getAllParent() {
+        List<DmDepart> result = new ArrayList<>();
+        List<DmDepart> temp = this.getAll();
+        for (DmDepart d : temp) {
+            if(d.getDepartCode().length() == 2){
+                result.add(d);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 查询所有子部门
+     * @author 张恩铭
+     * @return
+     */
+    @Override
+    public List<DmDepart> getAllChildren() {
+        List<DmDepart> result = new ArrayList<>();
+        List<DmDepart> temp = this.getAll();
+        for (DmDepart d : temp) {
+            if(d.getDepartCode().length() > 2){
+                result.add(d);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 添加部门
+     * @author 张恩铭
+     * @param dmDeparts
+     * @return
+     */
+    @Override
+    public ResultBean<Integer> addDepart(DmDepart[] dmDeparts) {
+        int i = 0;
+        for (DmDepart d : dmDeparts) {
+            if(d.getDepartCode() == null || d.getDepartCode().equals("")){
+                continue;
+            }else{
+                DmDepart temp = new DmDepart();
+                temp.setDepartCode(d.getDepartCode());
+                ConditionSelect<DmDepart> conditionSelect = new ConditionSelect<>(temp, new QueryWrapper<>(), this.dmDepartMapper);
+                if(conditionSelect.getResult().size() > 0){
+                    continue;
+                }else{
+                    if(this.dmDepartMapper.insert(d) == 1) i++;
+                }
+            }
+        }
+        ResultBean<Integer> resultBean = new ResultBean<>();
+        resultBean.setData(i);
+        return resultBean;
+    }
+
+    /**
+     * 修改部门
+     * @author 张恩铭
+     * @param dmDeparts
+     * @return
+     */
+    @Override
+    public ResultBean<Integer> updateDepart(DmDepart[] dmDeparts) {
+        int i = 0;
+        for (DmDepart d : dmDeparts) {
+            if(d.getDepartCode() == null || d.getDepartCode().equals("")){
+                continue;
+            }else{
+                DmDepart temp = new DmDepart();
+                temp.setDepartCode(d.getDepartCode());
+                ConditionSelect<DmDepart> conditionSelect = new ConditionSelect<>(temp, new QueryWrapper<>(), this.dmDepartMapper);
+                List<DmDepart> result = conditionSelect.getResult();
+                if(result.size() > 0 && !result.get(0).getDepartCode().equals(d.getDepartCode())){
+                    continue;
+                }else{
+                    if(this.dmDepartMapper.updateById(d) == 1) i++;
+                }
+            }
+        }
+        ResultBean<Integer> resultBean = new ResultBean<>();
+        resultBean.setData(i);
+        return resultBean;
+    }
+
+    /**
+     * 删除部门
+     * @author 张恩铭
+     * @param dmDeparts
+     * @return
+     */
+    @Override
+    public ResultBean<Integer> delDepart(DmDepart[] dmDeparts) {
+        int i = 0;
+        for (DmDepart d : dmDeparts) {
+            if(this.dmDepartMapper.deleteById(d) == 1) i++;
+        }
+        ResultBean<Integer> resultBean = new ResultBean<>();
+        resultBean.setData(i);
+        return resultBean;
+    }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean<List<DmDepart>> selectDepartQuery( List<String> params) {
+        ResultBean<List<DmDepart>> resultBean = new ResultBean<List<DmDepart>>();
+        resultBean.setData(dmDepartMapper.selectDepartQuery(params));
+        return resultBean;
+
+    }
+
+    @Resource
+    RedisTemplate<String ,Object> redisTemplate;
+    @Override
+    public void refreshRedis() {
+        List<DmDepart> list=this.list();
+        list.forEach(l->redisTemplate.opsForHash().put(RedisCacheKeyConfig.DEPT_KEY,l.getDepartCode(),l));
+    }
+}

src/main/java/com/dsic/gj_erp/service/sy/impl/DmEmployeeServiceImpl.java

@@ -0,0 +1,133 @@
+package com.dsic.gj_erp.service.sy.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.sy.DmEmployee;
+import com.dsic.gj_erp.mapper.DmEmployeeMapper;
+import com.dsic.gj_erp.service.sy.DmEmployeeService;
+import com.dsic.gj_erp.util.ConditionSelect;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @version V1.0.0
+ * @Title: DmEmployeeServiceImpl
+ * @Package com.dsic.xzerp.service.sy.impl
+ * @Description: 管系制造员工service实现类
+ * @author: 张恩铭
+ * @date: 2021/4/2 9:05
+ */
+@Service
+public class DmEmployeeServiceImpl extends ServiceImpl<DmEmployeeMapper, DmEmployee> implements DmEmployeeService {
+
+    @Resource
+    private DmEmployeeMapper dmEmployeeMapper;
+
+    private ResultBean resultBean;
+
+    /**
+     * 查询所有
+     * @return
+     */
+    @Override
+    public List<DmEmployee> getAll() {
+        return this.dmEmployeeMapper.selectList(null);
+    }
+
+    /**
+     * 非like不定条件查询
+     * @param dmEmployee
+     * @return
+     */
+    @Override
+    public List<DmEmployee> getByCondition(DmEmployee dmEmployee) {
+        ConditionSelect<DmEmployee> conditionSelect = new ConditionSelect<>(dmEmployee, new QueryWrapper<>(), this.dmEmployeeMapper);
+        return conditionSelect.getResult();
+    }
+
+    /**
+     * 特定like不定条件查询
+     * @param dmEmployee
+     * @return
+     */
+    @Override
+    public List<DmEmployee> getByConditionDefaultDepartCode(DmEmployee dmEmployee) {
+        String[] strings = {"departCode"};
+        ConditionSelect<DmEmployee> conditionSelect = new ConditionSelect<>(dmEmployee, new QueryWrapper<>(), this.dmEmployeeMapper, strings);
+        return conditionSelect.getResultBySomeLikeRight();
+    }
+
+    /**
+     * 添加员工
+     * @param dmEmployees
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean<Integer> addEmployee(DmEmployee[] dmEmployees) {
+        int i = 0;
+        for (DmEmployee d : dmEmployees) {
+
+                       this.dmEmployeeMapper.insert(d) ;
+        }
+        resultBean = new ResultBean<Integer>();
+
+        return resultBean;
+    }
+
+    /**
+     * 修改员工
+     * @param dmEmployees
+     * @return
+     */
+    @Override
+    public ResultBean<Integer> updateEmployee(DmEmployee[] dmEmployees) {
+        int i = 0;
+        for (DmEmployee d : dmEmployees) {
+            if(this.dmEmployeeMapper.updateById(d) == 1) i++;
+//            if(d.getDepartCode() == null){
+//                continue;
+//            }else{
+//                if(d.getDepartCode().length() == 2){
+//                    if(d.getEmployeeNo().substring(0, 2).equals(d.getDepartCode())){
+//                        if(this.dmEmployeeMapper.updateById(d) == 1) i++;
+//                    }else{
+//                        continue;
+//                    }
+//                }else if(d.getDepartCode().length() == 4){
+//                    if(d.getEmployeeNo().substring(0, 4).equals(d.getDepartCode())){
+//                        if(this.dmEmployeeMapper.updateById(d) == 1) i++;
+//                    }else{
+//                        continue;
+//                    }
+//                }else{
+//                    continue;
+//                }
+//            }
+        }
+        resultBean = new ResultBean<Integer>();
+        resultBean.setData(i);
+        return resultBean;
+    }
+
+    /**
+     * 删除员工
+     * @param dmEmployees
+     * @return
+     */
+    @Override
+    public ResultBean<Integer> delEmployee(DmEmployee[] dmEmployees) {
+        int i = 0;
+        for (DmEmployee d : dmEmployees) {
+            if(this.dmEmployeeMapper.deleteById(d) == 1) i++;
+        }
+        resultBean = new ResultBean<Integer>();
+        resultBean.setData(i);
+        return resultBean;
+    }
+}

src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java

@@ -0,0 +1,111 @@
+package com.dsic.gj_erp.service.sy.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.sy.SyDictItem;
+import com.dsic.gj_erp.mapper.SyDictItemMapper;
+import com.dsic.gj_erp.service.sy.SyDictItemService;
+import com.dsic.gj_erp.util.CacheConstant;
+import com.dsic.gj_erp.util.ConditionSelect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.cache.annotation.Cacheable;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-16
+ */
+@Service
+public class SyDictItemServiceImpl extends ServiceImpl<SyDictItemMapper, SyDictItem> implements SyDictItemService {
+
+   @Autowired
+   SyDictItemMapper syDictItemMapper;
+
+
+    /**
+     * 根据表编码转换
+     * @param table
+     * @param text
+     * @param code
+     * @param key
+     * @return
+     */
+    @Cacheable(value = CacheConstant.SYS_DICT_TABLE_CACHE,unless="#result == null")
+    @Override
+    public String translateDictFromTable(String table, String text, String code, String key) {
+        log.debug("无缓存dictTable的时候调用这里！1");
+        System.out.println("无缓存dictCache的时候调用这里！1");
+        return syDictItemMapper.queryTableDictTextByKey(table, text, code, key);
+    }
+
+    /**
+     * 编码转换
+     * @param code
+     * @param key
+     * @return
+     */
+    @Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#code+':'+#key", unless="#result == null")
+    @Override
+    public String translateDict(String code, String key) {
+        log.debug("无缓存dictTable的时候调用这里！2");
+        System.out.println("无缓存dictCache的时候调用这里！2");
+        return syDictItemMapper.queryDictTextByKey(code, key);
+
+    }
+
+    /**
+     * 多条件编码转换
+     * @param table
+     * @param text
+     * @param code
+     * @param key
+     * @param code1
+     * @param key1
+     * @return
+     */
+    @Cacheable(value = CacheConstant.SYS_DICT_TABLE_BY_KEYS_CACHE)
+    @Override
+    public String translateDictFromTableByKey(String table, String text, String code, String key,String code1, String key1) {
+        log.debug("无缓存dictTable的时候调用这里！3");
+        System.out.println("无缓存dictCache的时候调用这里！3");
+        return syDictItemMapper.queryTableDictTextByKeySys(table, text, code, key,code1, key1);
+
+    }
+
+    /**
+     * 通过编码获取同编码的值
+     * @param syDictItem
+     * @return
+     */
+    @Override
+    public List<SyDictItem> getByCode(SyDictItem syDictItem) {
+        QueryWrapper<SyDictItem> queryWrapper = new QueryWrapper<>();
+        ConditionSelect<SyDictItem> conditionSelect = new ConditionSelect<>(syDictItem, queryWrapper, syDictItemMapper);
+        return conditionSelect.getResult();
+    }
+
+
+    @Override
+    public List<Map<String, Object>> getCodeByString(String code) {
+        QueryWrapper<SyDictItem> qw = new QueryWrapper<>();
+        qw.select("item_value as label","item_code as value");
+        qw.eq("dict_code",code);
+
+//        this.list(qw);
+        List<Map<String, Object>> maps = syDictItemMapper.selectMaps(qw);
+        return maps;
+    }
+
+    @Override
+    public Map<String, SyDictItem> getCodeToMap(String dictCode) {
+        return baseMapper.getCodeToMap(dictCode);
+    }
+}

src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java

@@ -0,0 +1,111 @@
+package com.dsic.gj_erp.service.sy.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.sy.SyDict;
+import com.dsic.gj_erp.bean.tree.ProjectTreeVo;
+import com.dsic.gj_erp.mapper.SyDictMapper;
+import com.dsic.gj_erp.service.sy.SyDictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-03-15
+ */
+@Service
+public class SyDictServiceImpl extends ServiceImpl<SyDictMapper, SyDict> implements SyDictService {
+
+
+    @Override
+    public List<ProjectTreeVo> getTreeList(Map<String, Object> params) {
+        QueryWrapper<SyDict> queryWrapper = new QueryWrapper<SyDict>();
+        if (!StringUtils.isBlank((String)params.get("name"))){
+            queryWrapper.and(wp->wp.like("dict_code",params.get("name")).or().like("dict_name",params.get("name")));
+        }
+        List<SyDict> list = this.list(queryWrapper);
+        //父级
+        List<ProjectTreeVo> vo= new ArrayList<>();
+        ProjectTreeVo projectTreeVo =new ProjectTreeVo();
+        //子级
+        List<ProjectTreeVo> projectTreeVoList = new ArrayList<>();
+
+        list.stream().forEach(e->{
+            ProjectTreeVo tree=new ProjectTreeVo();
+            tree.setId(e.getDictCode());
+            tree.setLabel(e.getDictName());
+            tree.setParentBm("@@@");
+            projectTreeVoList.add(tree);
+        });
+        projectTreeVo.setId("@@@").setLabel("编码类别").setChildren(projectTreeVoList);
+        vo.add(projectTreeVo);
+        return  vo;
+
+
+    }
+
+    @Override
+    public List<ProjectTreeVo> getTxTreeList(Map<String, Object> params) {
+        QueryWrapper<SyDict> queryWrapper = new QueryWrapper<SyDict>();
+
+        queryWrapper.eq(StringUtils.isNotBlank((String)params.get("code")),"system_code",params.get("code"));
+        if(StringUtils.isNotBlank((String)params.get("name"))){
+            queryWrapper.and(wp->wp.like("dict_code",params.get("name")).or().like("dict_name",params.get("name")));
+        }
+        List<SyDict> list = this.list(queryWrapper);
+        //父级
+        List<ProjectTreeVo> vo= new ArrayList<>();
+        ProjectTreeVo projectTreeVo =new ProjectTreeVo();
+        //子级
+        List<ProjectTreeVo> projectTreeVoList = new ArrayList<>();
+
+        list.stream().forEach(e->{
+            ProjectTreeVo tree=new ProjectTreeVo();
+            tree.setId(e.getDictCode());
+            tree.setLabel(e.getDictName()+"["+e.getDictCode()+"]");
+            tree.setParentBm("@@@");
+            projectTreeVoList.add(tree);
+        });
+        projectTreeVo.setId("@@@").setLabel("编码类别").setChildren(projectTreeVoList);
+        vo.add(projectTreeVo);
+        return  vo;
+    }
+
+    @Override
+    public List<ProjectTreeVo> getTreeListForQKFL(Map<String, Object> params) {
+        QueryWrapper<SyDict> queryWrapper = new QueryWrapper<SyDict>();
+
+        queryWrapper.eq(StringUtils.isNotBlank((String)params.get("code")),"system_code",params.get("code"))
+                    .in("dict_name","集团切块","舾装切块");
+
+        if(StringUtils.isNotBlank((String)params.get("name"))){
+            queryWrapper.and(wp->wp.like("dict_code",params.get("name")).or().like("dict_name",params.get("name")));
+        }
+        List<SyDict> list = this.list(queryWrapper);
+        //父级
+        List<ProjectTreeVo> vo= new ArrayList<>();
+        ProjectTreeVo projectTreeVo =new ProjectTreeVo();
+        //子级
+        List<ProjectTreeVo> projectTreeVoList = new ArrayList<>();
+
+        list.stream().forEach(e->{
+            ProjectTreeVo tree=new ProjectTreeVo();
+            tree.setId(e.getDictCode());
+            tree.setLabel(e.getDictName());
+            tree.setParentBm("@@@");
+            projectTreeVoList.add(tree);
+        });
+        projectTreeVo.setId("@@@").setLabel("编码类别").setChildren(projectTreeVoList);
+        vo.add(projectTreeVo);
+        return  vo;
+    }
+}

src/main/java/com/dsic/gj_erp/service/sy/impl/SyLogServiceImpl.java

@@ -0,0 +1,21 @@
+package com.dsic.gj_erp.service.sy.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.sy.SyLog;
+import com.dsic.gj_erp.mapper.SyLogMapper;
+import com.dsic.gj_erp.service.sy.SyLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统日志表 服务实现类
+ * </p>
+ *
+ * @author xhj
+ * @since 2021-04-08
+ */
+@Service
+public class SyLogServiceImpl extends ServiceImpl<SyLogMapper, SyLog> implements SyLogService {
+
+}

src/main/java/com/dsic/gj_erp/util/CacheConstant.java

@@ -0,0 +1,22 @@
+package com.dsic.gj_erp.util;
+
+/**
+ * @author: huangxutao
+ * @date: 2019-06-14
+ * @description: 缓存常量
+ */
+public interface CacheConstant {
+
+	/**
+	 * 字典信息缓存
+	 */
+    public static final String SYS_DICT_CACHE = "sys:cache:dict";
+	/**
+	 * 表字典信息缓存
+	 */
+    public static final String SYS_DICT_TABLE_CACHE = "sys:cache:dictTable";
+
+	public static final String SYS_DICT_TABLE_BY_KEYS_CACHE = SYS_DICT_TABLE_CACHE + "ByKeys";
+
+
+}

src/main/java/com/dsic/gj_erp/util/ConditionSelect.java

@@ -0,0 +1,151 @@
+package com.dsic.gj_erp.util;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.util.List;
+
+/**
+ * @version V1.0.0
+ * @Title: ConditionSelect
+ * @Package com.dsic.xzerp.bean
+ * @Description: 条件查询
+ * @author: 张恩铭
+ * @date: 2021/3/16 11:28
+ */
+public class ConditionSelect<T> implements Serializable {
+
+    private T entity;
+    private QueryWrapper<T> queryWrapper;
+    private BaseMapper<T> baseMapper;
+    private String[] likeAttrs;
+
+    public ConditionSelect(T data, QueryWrapper<T> queryWrapper, BaseMapper<T> baseMapper){
+        this.entity = data;
+        this.queryWrapper = queryWrapper;
+        this.baseMapper = baseMapper;
+    }
+
+    public ConditionSelect(T data, QueryWrapper<T> queryWrapper, BaseMapper<T> baseMapper, String[] likeAttrs){
+        this.entity = data;
+        this.queryWrapper = queryWrapper;
+        this.baseMapper = baseMapper;
+        this.likeAttrs = likeAttrs;
+    }
+
+    /**
+     * 无like不定条件查询
+     * @return java.util.List
+     */
+    public List<T> getResult(){
+        try{
+            Field[] fields = entity.getClass().getDeclaredFields();
+
+            for (Field f:fields) {
+                if (f.getAnnotation(TableField.class)!=null&&!f.getAnnotation(TableField.class).exist()){
+                    continue;
+                }
+                f.setAccessible(true);
+                if (!f.getName().equals("serialVersionUID")){
+                    if(f.get(entity) != null && f.get(entity) != "" && f.get(entity).toString().toLowerCase() != "null"){
+                        char[] chars = f.getName().toCharArray();
+                        String temp_s = "";
+                        for (int i = 0; i < chars.length; i++){
+                            if(chars[i] >= 'A' && chars[i] <= 'Z'){
+                                String temp_ss = String.valueOf(chars[i]);
+                                temp_s = temp_s + "_" + temp_ss.toLowerCase();
+                            }else{
+                                temp_s += chars[i];
+                            }
+                        }
+                        queryWrapper.eq(temp_s, f.get(entity));
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        List<T> list = this.baseMapper.selectList(this.queryWrapper);
+        return list;
+    }
+
+    /**
+     * 只有like不定条件查询
+     * @return java.util.List
+     */
+    public List<T> getResultByLikeRight(){
+        try{
+            Field[] fields = entity.getClass().getDeclaredFields();
+            for (Field f:fields) {
+                f.setAccessible(true);
+                if (!f.getName().equals("serialVersionUID")){
+                    if(f.get(entity) != null && f.get(entity) != "" && f.get(entity).toString().toLowerCase() != "null"){
+                        char[] chars = f.getName().toCharArray();
+                        String temp_s = "";
+                        for (int i = 0; i < chars.length; i++){
+                            if(chars[i] >= 'A' && chars[i] <= 'Z'){
+                                String temp_ss = String.valueOf(chars[i]);
+                                temp_s = temp_s + "_" + temp_ss.toLowerCase();
+                            }else{
+                                temp_s += chars[i];
+                            }
+                        }
+                        queryWrapper.likeRight(temp_s, f.get(entity));
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        List<T> list = this.baseMapper.selectList(this.queryWrapper);
+        return list;
+    }
+
+    /**
+     * 特定like不定条件查询
+     * @return java.util.List
+     */
+    public List<T> getResultBySomeLikeRight(){
+        boolean flag = false;
+        try {
+            Field[] fields = entity.getClass().getDeclaredFields();
+            for (Field f:fields) {
+                f.setAccessible(true);
+                if (!f.getName().equals("serialVersionUID")){
+                    if(f.get(entity) != null && f.get(entity) != "" && f.get(entity).toString().toLowerCase() != "null"){
+                        for (String like_string: likeAttrs) {
+                            if(like_string.equals(f.getName())){
+                                flag = true;
+                            }
+                            break;
+                        }
+                        char[] chars = f.getName().toCharArray();
+                        String temp_s = "";
+                        for (int i = 0; i < chars.length; i++){
+                            if(chars[i] >= 'A' && chars[i] <= 'Z'){
+                                String temp_ss = String.valueOf(chars[i]);
+                                temp_s = temp_s + "_" + temp_ss.toLowerCase();
+                            }else{
+                                temp_s += chars[i];
+                            }
+                        }
+                        if(!flag){
+                            queryWrapper.eq(temp_s, f.get(entity));
+                        }else{
+                            queryWrapper.likeRight(temp_s, f.get(entity));
+                        }
+                    }
+                }
+                flag = false;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        List<T> list = this.baseMapper.selectList(this.queryWrapper);
+        return list;
+    }
+
+}

src/main/java/com/dsic/gj_erp/util/IPUtils.java

@@ -0,0 +1,57 @@
+package com.dsic.gj_erp.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * IP地址
+ * 
+ * @Author xhj
+ * @Date 2021年04月18日
+ */
+public class IPUtils {
+	private static Logger logger = LoggerFactory.getLogger(IPUtils.class);
+
+	/**
+	 * 获取IP地址
+	 * 
+	 * 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址
+	 * 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址
+	 */
+	public static String getIpAddr(HttpServletRequest request) {
+    	String ip = null;
+        try {
+            ip = request.getHeader("x-forwarded-for");
+            if (StringUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("Proxy-Client-IP");
+            }
+            if (StringUtils.isBlank(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("WL-Proxy-Client-IP");
+            }
+            if (StringUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("HTTP_CLIENT_IP");
+            }
+            if (StringUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+            }
+            if (StringUtils.isBlank(ip) || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getRemoteAddr();
+            }
+        } catch (Exception e) {
+        	logger.error("IPUtils ERROR ", e);
+        }
+        
+//        //使用代理，则获取第一个IP地址
+//        if(StringUtils.isEmpty(ip) && ip.length() > 15) {
+//			if(ip.indexOf(",") > 0) {
+//				ip = ip.substring(0, ip.indexOf(","));
+//			}
+//		}
+        
+        return ip;
+    }
+	
+}

src/main/resources/mappers/jcsj/EmSbcnpMapper.xml

@@ -3,12 +3,10 @@
 <mapper namespace="com.dsic.gj_erp.mapper.jcsj.EmSbcnpMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.jcsj.EmSbcnp">
+<insert id="test">
-        <id column="SBBH" property="sbbh" />
+    INSERT into em_sbcnp(id) VALUES(
-        <result column="SBMC" property="sbmc" />
+                                       REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','')
-        <result column="sbcn" property="sbcn" />
+                                   )
-        <result column="dw" property="dw" />
+</insert>
-        <result column="dwsj" property="dwsj" />
-    </resultMap>
 
 </mapper>

src/main/resources/mappers/jhgk/DmSygdMxMapper.xml

@@ -25,6 +25,7 @@
           and MS_DDMXP.WPKD=#{rkxh}
         GROUP BY MS_DDMXP.WPHD,MS_DDMXP.WPCD,MS_DDMXP.WPKD,MS_DDMXP.RKXH
     </select>
+
     <select id="getLjxx" resultType="com.dsic.gj_erp.bean.jhgk.DmSygdMxLj">
         insert   into dm_sygd_mx_lj(
             xzglxq ,
@@ -168,9 +169,9 @@
                     pklx,
                     qbs,
                     pkbs,
-                    pkcd,
+                    sum(pkcd) as pkcd,
                     dmbs,
-                    dmcd,
+                    sum(dmcd) as dmcd,
                     hxcd,
                     qgcd,
                     xcgs,
@@ -180,16 +181,9 @@
                     bcylzl,
                     bcljtlzl,
                     ylbhgg,
-                    bcqpyld
+                    bcqpyld,
-                    ,blgs as blgs
+                    hxkc_cd,
-                    ,pwgs as pwgs
+                    qgkc_cd
-                    ,llgs as llgs
-                    ,hxgs as hxgs
-                    ,  qggs as qggs
-                    ,  sum(pkgs)  as pkgs
-                    ,  sum(dmgs)  as dmgs
-                    ,  sum(qgs)   as qjggs
-                    ,  sum(zpgs)  as zpgs
 
             from dm_sygd_mx_lj
             where
@@ -197,7 +191,8 @@
             GROUP BY dcch, mbch, sjch, PL, tzbh
                     , lqlb, kw, zl, wpcz, wpgg, ljsl, pklx, qbs, pkbs
                     , pkcd, dmbs, dmcd, hxcd,qgcd, xcgs, xcshms, bclqzl
-                    ,bcshzl, bcylzl, bcljtlzl, ylbhgg, bcqpyld , blgs , pwgs, llgs, hxgs, qggs
+                    ,bcshzl, bcylzl, bcljtlzl, ylbhgg, bcqpyld,hxkc_cd,
+                    qgkc_cd
             order BY jssj, dcch, pl, tzbh
     </select>
     <select id="getPl" resultType="com.dsic.gj_erp.bean.jhgk.dto.Pldto">
@@ -270,15 +265,6 @@
                    , dm_sygd_mx.dc_pl                 as pl
                    , dm_sygd_mx.dc_fd                 as fd
                    , COUNT(1)                         as bs
-                   , sum(blgs)                        as blgs
-                   , sum(pwgs)                        as pwgs
-                   , sum(llgs)                        as llgs
-                   , sum(hxgs)                        as hxgs
-                   , sum(qggs)                        as qggs
-                   , sum(pkgs)                        as pkgs
-                   , sum(dmgs)                        as dmgs
-                   , sum(qgs)                         as qjggs
-                   , sum(zpgs)                        as zpgs
               from dm_sygd_mx
               where dm_sygd_mx.jssj BETWEEN #{begin} and #{end}
               GROUP BY substring(dm_sygd_mx.jssj, 0, 8), dm_sygd_mx.kw

src/main/resources/mappers/jhgk/DmZrcjhMapper.xml

@@ -45,7 +45,7 @@
         <foreach item="item" collection="list"  separator=";"  >
             update dm_czplp_new
             set
-            dzjsq_zrc = #{item.gjjsDz},xzjsq_zrc = #{item.jssjXz},gjks_zrc = #{item.gjks}
+            dzjsq_zrc = #{item.gjjsDz},xzjsq_zrc = #{item.gjjsXz},gjks_zrc = #{item.gjks}
             where DC_CH=#{item.dcCh} and DC_PL=#{item.dcPl}
         </foreach>
     </update>

src/main/resources/mappers/sy/DmDepartMapper.xml

@@ -0,0 +1,30 @@
+<?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.dsic.gj_erp.mapper.DmDepartMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.sy.DmDepart">
+        <id column="depart_code" property="departCode" />
+        <result column="depart_name" property="departName" />
+        <result column="parent_code" property="parentCode" />
+        <result column="depart_fullname" property="departFullname" />
+        <result column="sort_no" property="sortNo" />
+        <result column="depart_attr" property="departAttr" />
+        <result column="depart_type" property="departType" />
+        <result column="manu_type" property="manuType" />
+        <result column="depart_status" property="departStatus" />
+        <result column="manu_flag" property="manuFlag" />
+        <result column="paint_flag" property="paintFlag" />
+        <result column="dist_flag" property="distFlag" />
+        <result column="charger" property="charger" />
+        <result column="landline_phone" property="landlinePhone" />
+        <result column="mobile_phone" property="mobilePhone" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        depart_code, depart_name, parent_code, depart_fullname, sort_no, depart_attr, depart_type, manu_type, depart_status, manu_flag, paint_flag, dist_flag, charger, landline_phone, mobile_phone, remark
+    </sql>
+
+</mapper>

src/main/resources/mappers/sy/SyDictItemMapper.xml

@@ -0,0 +1,49 @@
+<?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.dsic.gj_erp.mapper.SyDictItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.sy.SyDictItem">
+        <id column="id" property="id" />
+        <result column="dict_code" property="dictCode" />
+        <result column="item_code" property="itemCode" />
+        <result column="item_value" property="itemValue" />
+        <result column="remark" property="remark" />
+        <result column="sort_no" property="sortNo" />
+        <result column="params1" property="params1" />
+        <result column="params2" property="params2" />
+        <result column="params3" property="params3" />
+        <result column="params4" property="params4" />
+        <result column="params5" property="params5" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, dict_code, item_code, item_value, remark, sort_no, params1, params2, params3, params4, params5
+    </sql>
+
+
+    <!-- my -->
+    <select id="queryTableDictTextByKey" parameterType="String" resultType="String">
+		   select ${text} as "text" from ${table} where ${code}= #{key}
+	</select>
+
+    <select id="queryTableDictTextByKeySys" parameterType="String" resultType="String">
+		   select ${text} as "text" from ${table} where ${code}= #{key} and  ${code1}= #{key1}
+	</select>
+
+    <select id="queryDictTextByKey" parameterType="String"  resultType="String">
+		   select s.item_value from sy_dict_item s
+		   where s.dict_code = #{code}
+		   and s.item_code = #{key}
+	</select>
+    <select id="getCodeToMap" resultType="com.dsic.gj_erp.bean.sy.SyDictItem">
+        select
+            item_code as itemCode ,item_value as itemValue
+        from
+            sy_dict_item
+        where
+            dict_code=#{dictCode}
+    </select>
+
+</mapper>

src/main/resources/mappers/sy/SyDictMapper.xml

@@ -0,0 +1,18 @@
+<?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.dsic.gj_erp.mapper.SyDictMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.sy.SyDict">
+        <id column="dict_code" property="dictCode" />
+        <result column="dict_name" property="dictName" />
+        <result column="system_code" property="systemCode" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        dict_code, dict_name, system_code, remark
+    </sql>
+
+</mapper>

src/main/resources/mappers/sy/SyLogMapper.xml

@@ -0,0 +1,24 @@
+<?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.dsic.gj_erp.mapper.SyLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.sy.SyLog">
+        <id column="id" property="id" />
+        <result column="user_code" property="userCode" />
+        <result column="user_name" property="userName" />
+        <result column="system_code" property="systemCode" />
+        <result column="system_name" property="systemName" />
+        <result column="content" property="content" />
+        <result column="method" property="method" />
+        <result column="computer_name" property="computerName" />
+        <result column="ip" property="ip" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, user_code, user_name, system_code, system_name, content, method, computer_name, ip, create_time
+    </sql>
+
+</mapper>

src/main/resources/mappers/sy/SyuserMapper.xml

@@ -30,4 +30,140 @@
 
         ORDER BY id
     </select>
+    <select id="getDepartList" resultType="Map">
+        SELECT * FROM dm_depart order by len(depart_code),depart_code
+    </select>
+
+
+    <insert id="addRole" parameterType="Map">
+        INSERT INTO sy_role (role_code,role_name,remark) VALUES (#{role_code},#{role_name},#{remark})
+    </insert>
+
+    <delete id="deleteRole" parameterType="String">
+        DELETE FROM sy_role WHERE role_code =#{role_code}
+    </delete>
+
+
+    <update id="updateRole" parameterType="Map">
+        UPDATE sy_role SET  role_code =#{role_code},role_name =#{role_name},remark =#{remark} WHERE role_code =#{role_code}
+    </update>
+
+
+    <select id="getRoleList" resultType="Map">
+        SELECT * FROM sy_role
+    </select>
+
+
+    <select id="getRoleListByUser" resultType="Map">
+        select role_code from sy_user_role where user_code=#{user_code}
+    </select>
+
+
+    <insert id="addRoleForUser" parameterType="Map">
+        INSERT INTO sy_user_role (user_code,role_code) VALUES (#{user_code},#{role_code})
+    </insert>
+
+    <delete id="deleteRoleForUser" parameterType="Map">
+        DELETE FROM sy_user_role WHERE user_code =#{user_code} AND role_code =#{role_code}
+    </delete>
+
+
+    <select id="getSystemList" resultType="Map">
+        select * from sy_system
+    </select>
+
+
+    <select id="getMenuList" resultType="Map">
+        select * from sy_menu
+    </select>
+
+    <select id="getUserListByMenu" resultType="Map">
+        SELECT a.*,GROUP_CONCAT(DISTINCT b.role_code separator ';') AS roles FROM sy_user as a
+                                                                                      LEFT JOIN sy_user_role as b on a.user_code = b.user_code
+                                                                                      LEFT JOIN sy_menu_role as c on b.role_code =c.role_code
+        WHERE menu_id =#{menu_id} GROUP BY a.user_code
+    </select>
+
+
+    <select id="getInstitutionList" resultType="Map">
+        select * from dm_institution
+    </select>
+
+
+    <select id="getUserListByRole" resultType="Map">
+        select user_code from sy_user_role where role_code= #{role_code}
+    </select>
+
+
+    <select id="getInstitutionListByRole" resultType="Map">
+        select institution_code from sy_institution_role where role_code= #{role_code}
+    </select>
+
+
+    <insert id="addRoleForInstitution" parameterType="Map">
+        INSERT INTO sy_institution_role (institution_code,role_code) VALUES (#{institution_code},#{role_code})
+    </insert>
+
+    <delete id="deleteRoleForInstitution" parameterType="Map">
+        DELETE FROM sy_institution_role WHERE institution_code =#{institution_code} AND role_code =#{role_code}
+    </delete>
+
+
+    <select id="getSystemListByRole" resultType="Map">
+        select system_code from sy_sytem_role where role_code= #{role_code}
+    </select>
+
+    <insert id="addRoleForSystem" parameterType="Map">
+        INSERT INTO sy_sytem_role (system_code,role_code) VALUES (#{system_code},#{role_code})
+    </insert>
+
+    <delete id="deleteRoleForSystem" parameterType="Map">
+        DELETE FROM sy_sytem_role WHERE system_code =#{system_code} AND role_code =#{role_code}
+    </delete>
+
+
+    <select id="getMenuListByRole" resultType="Map">
+        select distinct menu_id from sy_menu_role where role_code= #{role_code}
+    </select>
+
+    <insert id="addRoleForMenu" parameterType="Map">
+        INSERT INTO sy_menu_role (menu_id,role_code) VALUES (#{menu_id},#{role_code})
+    </insert>
+
+    <delete id="deleteRoleForMenu" parameterType="Map">
+        DELETE FROM sy_menu_role WHERE menu_id =#{menu_id} AND role_code =#{role_code}
+    </delete>
+
+    <insert id="addFingerprintResult" parameterType="String">
+        INSERT INTO dm_fingerprint (uuid,fingerprint,user_code) VALUES (#{uuid},#{fingerprint},#{user_code})
+    </insert>
+
+    <select id="getCodeByUuid" resultType="String">
+        SELECT user_code FROM dm_fingerprint where  uuid =#{uuid}
+    </select>
+
+    <update id="updateFingerprint">
+        UPDATE sy_user SET fingerprint = #{fingerprint} WHERE fingerprint =#{uuid}
+    </update>
+
+    <select id="getUserInfo" resultType="java.util.Map" parameterType="String">
+        select
+            u.*,group_concat(sur.role_code) role
+        from
+            sy_user u left join sy_user_role sur on u.user_code = sur.user_code
+        where
+            u.user_code=#{userCode}
+        group by
+            u.user_code
+    </select>
+
+    <update id="updateFingerprint1">
+        UPDATE sy_user SET fingerprint = #{fingerprint} WHERE user_code =#{userCode}
+    </update>
+    <update id="updateFingerprint2">
+        UPDATE sy_user SET fingerprint1 = #{fingerprint} WHERE user_code =#{userCode}
+    </update>
+    <update id="updateFingerprint3">
+        UPDATE sy_user SET fingerprint2 = #{fingerprint} WHERE user_code =#{userCode}
+    </update>
 </mapper>