diff --git a/pom.xml b/pom.xml index 8784b15..c6d56f2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ ruoyi http://www.ruoyi.vip - 若依管理系统 + 金鸡湖服务管理系统 3.8.7 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java index 2bdaa17..4a1654f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java @@ -15,14 +15,7 @@ import com.ruoyi.jjh.ent.entity.JProject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -80,8 +73,8 @@ public class BmsEnterpriseBasicInfoController extends BaseController { */ @ApiOperation(value = "导入企业基础信息列表") @Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT) - @PostMapping("/importEnterprise") - public AjaxResult importEnterprise(MultipartFile file) throws Exception{ + @PostMapping(value = "/importEnterprise", consumes = "multipart/form-data") + public AjaxResult importEnterprise(@RequestPart("file")MultipartFile file) throws Exception{ List allList = bmsEnterpriseBasicInfoService.list(); ExcelUtil util = new ExcelUtil<>(BmsEnterpriseBasicInfo.class); List proList = util.importExcel(file.getInputStream()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java index bd0d846..15c53e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsApprovalInfo.java @@ -43,6 +43,9 @@ public class BmsApprovalInfo extends BaseInfoEntity { @Excel(name = "默认审批人id") private Long approvalById; + @Excel(name = "默认审批部门") + private Long approvalDept; + /** * 审批状态(0=待审核.1=审批通过,2=审批驳回) */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java index f63a43e..658d322 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java @@ -35,17 +35,17 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { /** * 企业名称 */ - @ApiModelProperty("企业名称") - @JSONField(name = "企业名称") - @Excel(name = "企业名称") + @ApiModelProperty("单位名称") + @JSONField(name = "单位名称") + @Excel(name = "单位名称") private String enterpriseName; /** - * 企业统一信用代码 + * 统一社会信用代码 */ - @ApiModelProperty("企业统一信用代码") - @JSONField(name = "企业统一信用代码") - @Excel(name = "企业统一信用代码") + @ApiModelProperty("统一社会信用代码") + @JSONField(name = "统一社会信用代码") + @Excel(name = "统一社会信用代码") private String creditCode; @@ -105,6 +105,22 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { @Excel(name = "组织机构代码") private String institutionCode; + /** + * 行业代码 + */ + @ApiModelProperty("行业代码") + @JSONField(name = "行业代码") + @Excel(name = "行业代码") + private String industryCode; + + /** + * 登记注册统计类别 + */ + @ApiModelProperty("登记注册统计类别") + @JSONField(name = "登记注册统计类别") + @Excel(name = "登记注册统计类别") + private String statisticalCategories; + /** * 参保人数 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java index 7cf00e2..4c230c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/ApprovalDeclarationRecordsQueryDto.java @@ -54,8 +54,8 @@ public class ApprovalDeclarationRecordsQueryDto implements Serializable { @ApiModelProperty(value = "用户id") private List userIds; - @ApiModelProperty(value = "审批人id") - private Long approvalById; + @ApiModelProperty(value = "审批部门") + private Long approvalDept; @ApiModelProperty(value = "审批状态集合") private List approvalStatusStr; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java index d961bfd..8636831 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsDeclarationRecordsServiceImpl.java @@ -24,10 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.stream.Collectors; @@ -193,10 +190,10 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto) { // approvalDeclarationRecordsQueryDto.setUserIds(iCommonService.getUserIds(SecurityContextHolder.getUserId())); if (SecurityUtils.getUserId().equals(1L)) { - approvalDeclarationRecordsQueryDto.setApprovalById(null); + approvalDeclarationRecordsQueryDto.setApprovalDept(null); } else { // todo SecurityContextHolder.getUserId()失效换成SecurityUtils.getUserId() - approvalDeclarationRecordsQueryDto.setApprovalById(SecurityUtils.getUserId()); + approvalDeclarationRecordsQueryDto.setApprovalDept(SecurityUtils.getDeptId()); } return baseMapper.approvalList(approvalDeclarationRecordsQueryDto); } @@ -239,8 +236,8 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl bmsProcessInfoList = iBmsProcessInfoService.lambdaQuery().eq(BmsProcessInfo::getApprovalType, 0).list(); BmsProcessInfo bmsProcessInfo = new BmsProcessInfo(); bmsProcessInfoList.forEach(x -> { - boolean flag = Arrays.asList(x.getApprovalByIds().split(",")).contains(String.valueOf(SecurityUtils.getUserId())); - if (flag) { +// boolean flag = Arrays.asList(x.getApprovalByIds().split(",")).contains(String.valueOf(SecurityUtils.getUserId())); + if (Objects.equals(x.getApprovalDept(), SecurityUtils.getDeptId())) { BeanUtil.copyProperties(x, bmsProcessInfo); } }); @@ -256,6 +253,7 @@ public class BmsDeclarationRecordsServiceImpl extends ServiceImpl token = tokenService.createToken(loginUser); - return String.valueOf(token.get("access_token")); - } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/ChiefResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/ChiefResponse.java new file mode 100644 index 0000000..b075915 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/ChiefResponse.java @@ -0,0 +1,45 @@ +package com.ruoyi.jjh.declaration.single.dto.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 政务端用户 + * @author du + * @since 2024/6/4 11:05 + */ +@Data +@ApiModel("政务端用户") +public class ChiefResponse { + @ApiModelProperty("本系统token") + private String token; + + private String id; + private String mainTopOrganizationId; + private String isEnabled; + private String isOfficial; + private String isUseOA; + private String name; + private String familyName; + private String givenName; + private String accountName; + private String email; + private String mobile; + private String sex; + private String idNumber; + private String birthday; + private String workPhone; + private String shortPhone; + private String workAddress; + private String state; + private String description; + private String secondaryEmail; + private String hasDomainAccount; + private SettingsResponse settings; + private List organizations; + private String whenCreated; + private String whenUpdated; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/OrganizationsOtherResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/OrganizationsOtherResponse.java new file mode 100644 index 0000000..113fc29 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/OrganizationsOtherResponse.java @@ -0,0 +1,26 @@ +package com.ruoyi.jjh.declaration.single.dto.response; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * organizations其他响应类 + * @author du + * @since 2024/6/4 14:42 + */ +@Data +@ApiModel("organizations其他响应类") +public class OrganizationsOtherResponse { + + private String id; + private String parentId; + private String name; + private String path; + private String displayName; + private String description; + private String order; + private String whenCreated; + private String whenUpdated; + private String type; + private SettingsResponse settings; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/OrganizationsResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/OrganizationsResponse.java new file mode 100644 index 0000000..65e3a96 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/OrganizationsResponse.java @@ -0,0 +1,21 @@ +package com.ruoyi.jjh.declaration.single.dto.response; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * organizations响应类 + * @author du + * @since 2024/6/4 14:40 + */ +@Data +@ApiModel("organizations响应类") +public class OrganizationsResponse { + private String userId; + private String isPrimary; + private String organizationId; + private String userOrder; + private String organizationOrder; + private String user; + private OrganizationsOtherResponse organization; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/SettingsResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/SettingsResponse.java new file mode 100644 index 0000000..af3a929 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/SettingsResponse.java @@ -0,0 +1,18 @@ +package com.ruoyi.jjh.declaration.single.dto.response; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * settings响应类 + * @author du + * @since 2024/6/4 11:07 + */ +@Data +@ApiModel("settings响应类") +public class SettingsResponse { + private String isContactsHidden; + private String isContactsHiddenMobile; + private String isContactsHiddenBirthday; + private String isContactsHiddenWorkPhone; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/reqponse/UserMainResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/UserMainResponse.java similarity index 92% rename from ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/reqponse/UserMainResponse.java rename to ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/UserMainResponse.java index 342e74e..7915e2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/reqponse/UserMainResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/UserMainResponse.java @@ -1,4 +1,4 @@ -package com.ruoyi.jjh.declaration.single.dto.reqponse; +package com.ruoyi.jjh.declaration.single.dto.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/reqponse/UserResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/UserResponse.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/reqponse/UserResponse.java rename to ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/UserResponse.java index 8986d02..e5dad6e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/reqponse/UserResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/dto/response/UserResponse.java @@ -1,4 +1,4 @@ -package com.ruoyi.jjh.declaration.single.dto.reqponse; +package com.ruoyi.jjh.declaration.single.dto.response; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/SingleLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/SingleLoginService.java new file mode 100644 index 0000000..bf87a10 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/SingleLoginService.java @@ -0,0 +1,10 @@ +package com.ruoyi.jjh.declaration.single.service; + +/** + * 用户验证 + * @author du + * @since 2024/6/4 15:16 + */ +public interface SingleLoginService { + String singleLogin(String userName,String nickName,Long id,String userType); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java new file mode 100644 index 0000000..41e2c46 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java @@ -0,0 +1,90 @@ +package com.ruoyi.jjh.declaration.single.service.impl; + +import com.ruoyi.common.constant.Constants; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.exception.user.UserPasswordNotMatchException; +import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.framework.manager.AsyncManager; +import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.ruoyi.framework.security.context.AuthenticationContextHolder; +import com.ruoyi.framework.web.service.TokenService; +import com.ruoyi.jjh.declaration.single.service.SingleLoginService; +import com.ruoyi.system.service.ISysUserService; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * @author du + * @since 2024/6/4 15:17 + */ +@Service +public class SingleLoginServiceImpl implements SingleLoginService { + + @Resource + private AuthenticationManager authenticationManager; + + @Resource + private TokenService tokenService; + + @Resource + private ISysUserService userService; + + @Override + public String singleLogin(String userName, String nickName, Long id, String userType) { + // 用户验证 + Authentication authentication; + try { + SysUser user = new SysUser(); + user.setUserName(userName); + user.setNickName(nickName); + user.setPassword("admin123"); + Long[] roles = new Long[1]; + if("01".equals(userType)){ + roles[0]=101L; + }else if("02".equals(userType)){ + roles[0]=101L; + } + user.setRoleIds(roles); + user.setStatus("0"); + user.setUserType(userType); + user.setEnterpriseId(id); + //如果用户名也就是信用代码没有重复的就新增用户 + if (userService.checkUserNameUnique(user)) + { + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + userService.insertUser(user); + } + //新增user账号密码 + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userName, "admin123"); + AuthenticationContextHolder.setContext(authenticationToken); +// 该方法会去调用UserDetailsServiceImpl.loadUserByUsername + authentication = authenticationManager.authenticate(authenticationToken); + } catch (Exception e) { + if (e instanceof BadCredentialsException) { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); + throw new UserPasswordNotMatchException(); + } else { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGIN_FAIL, e.getMessage())); + throw new ServiceException(e.getMessage()); + } + } finally { + AuthenticationContextHolder.clearContext(); + } + AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); + LoginUser loginUser = (LoginUser) authentication.getPrincipal(); + // 生成token + Map token = tokenService.createToken(loginUser); + return String.valueOf(token.get("access_token")); + } + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 13007eb..c41dad6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -11,19 +11,19 @@ import com.ruoyi.common.utils.StringUtils; * * @author ruoyi */ -@RestController +//@RestController public class SysIndexController { - /** 系统基础配置 */ - @Autowired - private RuoYiConfig ruoyiConfig; - - /** - * 访问首页，提示语 - */ - @RequestMapping("/") - public String index() - { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); - } +// /** 系统基础配置 */ +// @Autowired +// private RuoYiConfig ruoyiConfig; +// +// /** +// * 访问首页，提示语 +// */ +// @RequestMapping("/") +// public String index() +// { +// return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); +// } } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 8c1a615..6152412 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -62,4 +62,5 @@ spring: config: multi-statement-allow: true #自己客户端地址 -returnUrl: http://39.101.188.84:9999/demo/JinJiHu/#/login \ No newline at end of file +returnUrl: http://39.101.188.84:9999/demo/JinJiHu +#returnUrl: http://192.168.0.105:80/ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 57f0c63..1015f09 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -132,5 +132,10 @@ url: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogin infoUrl: https://qytt.sipac.gov.cn/api/usercenter/User/getInfo #退出登录url logoutUrl: https://qytt.sipac.gov.cn/api/usercenter/User/ssoLogOut +#政务端key +appkey: db90cb33-6551-4d1f-875e-236d66af4fcc +#政务内网获取用户信息 +zwUrl: http://uid.sipac.gov.cn/open/api/identity/data/FindUserByAccountName + diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml index 8e3ccb5..81a6a62 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml @@ -153,8 +153,8 @@ and a.matter like concat('%', #{matter}, '%') and a.status = #{status} - - and d.approval_by_id = #{approvalById} + + and d.approval_dept = #{approvalDept} and date_format(a.create_time ,'%y%m%d') >= date_format(#{startTime},'%y%m%d') diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml index 1eef9a7..dce1f95 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml @@ -27,11 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select id, enterprise_name, credit_code, - legal_entity,business_status,establish_date,registered_capital, + legal_entity,business_status,establish_date,registered_capital,statistical_categories,industry_code, enterprise_type,industry,institution_code,visitors_num,former_name,enroll_address, enroll_type,business, is_deleted, create_by, create_time, update_by, update_time, remark from bms_enterprise_basic_info @@ -84,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" enroll_address, enroll_type, business, - + industry_code, + statistical_categories, #{id}, @@ -108,6 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{enrollAddress}, #{enrollType}, #{business}, + #{industryCode}, + #{statisticalCategories}, @@ -135,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" enroll_address = #{enrollAddress}, enroll_type = #{enrollType}, business = #{business}, + industry_code = #{industryCode}, + statistical_categories = #{statisticalCategories}, where id = #{id}