打分

pcbms/src/main/java/com/hssx/pcbms/entity/Permission.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-25
+ * @since 2019-11-04
  */
 public class Permission extends Model<Permission> {
 
@@ -30,6 +30,12 @@ public class Permission extends Model<Permission> {
     @TableField("permission_name")
     private String permissionName;
 
+    /**
+     * 权限描述
+     */
+    @TableField("describe")
+    private String describe;
+
 
     public Integer getId() {
         return id;
@@ -47,6 +53,14 @@ public class Permission extends Model<Permission> {
         this.permissionName = permissionName;
     }
 
+    public String getDescribe() {
+        return describe;
+    }
+
+    public void setDescribe(String describe) {
+        this.describe = describe;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -57,6 +71,7 @@ public class Permission extends Model<Permission> {
         return "Permission{" +
         "id=" + id +
         ", permissionName=" + permissionName +
+        ", describe=" + describe +
         "}";
     }
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/GoodsServiceImpl.java

@@ -227,6 +227,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         String suffixModelNo = goodsNo.getDivisionCode() +"-"+ goodsNo.getSuffixCode();
         for (GoodsNo no : goodsNoList) {
             no.setModelNo(suffixModelNo+no.getModelNo().substring(no.getModelNo().length()-4));
+            no.setSuffixCode(goodsNo.getSuffixCode());
+            no.setDivisionCode(goodsNo.getDivisionCode());
         }
         if(!CollectionUtils.isEmpty(goodsNoList)){
             goodsNoService.updateBatchById(goodsNoList);

pcbms/src/main/java/com/hssx/pcbms/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("score");
+        strategy.setInclude("permission");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

pcbms/src/main/resources/mapper/PermissionMapper.xml

@@ -6,11 +6,12 @@
     <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.Permission">
         <id column="id" property="id" />
         <result column="permission_name" property="permissionName" />
+        <result column="describe" property="describe" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, permission_name
+        id, permission_name, describe
     </sql>
 
 </mapper>

pcbms/src/main/resources/mapper/UserMapper.xml

@@ -37,7 +37,7 @@
     <select id="selectUserRolesAndPermisssuons" resultMap="BaseResultMapVO">
         select
             u.id, u.head_url, u.name, u.phone, u.dept_id, u.is_pass, u.indate,u.role_name,
-            p.permission_name
+            p.permission_name,p.describe
         from
             user u
         left join user_permission up