更改bug

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/SystemSetUpController.java

@@ -70,8 +70,8 @@ public class SystemSetUpController {
     @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/marketSetDetail")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult<SystemMarketSetDetail> marketSetDetail(SystemErrorCodeParam param, HttpServletRequest request) {
-        return iSystemSetUpService.marketSetDetail(param, request);
+    private AjaxResult<SystemMarketSetDetail> marketSetDetail(Integer marketsectionid, HttpServletRequest request) {
+        return iSystemSetUpService.marketSetDetail(marketsectionid, request);
     }
 
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/ISystemSetUpService.java

@@ -19,5 +19,5 @@ public interface ISystemSetUpService {
 
     PageResult<SystemMarketSectionResult> queryMarketSet(SystemMarketSectionParam param, Integer pageNum, Integer pageSize, HttpServletRequest request);
 
-    AjaxResult<SystemMarketSetDetail> marketSetDetail(SystemErrorCodeParam param, HttpServletRequest request);
+    AjaxResult<SystemMarketSetDetail> marketSetDetail(Integer marketsectionid,  HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/FuncmenulistServiceImpl.java

@@ -127,7 +127,7 @@ public class FuncmenulistServiceImpl extends ServiceImpl<IFuncmenulistMapper, Fu
         List<Funcmenulist> funcmenulists = iFuncmenulistMapper.selectList(new QueryWrapper<Funcmenulist>()
                 .eq("MENUTYPE", menuType)
                 .eq("hidden", 1)
-                .orderBy(true,true,"sort"));
+                .orderBy(true, true, "sort"));
         return changeMenuToTreeNode(funcmenulists);
     }
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SystemSetUpServiceImpl.java

@@ -16,6 +16,7 @@ import com.muchinfo.mtp3interface.mapper.ISystemparamMapper;
 import com.muchinfo.mtp3pojos.entity.Errorcode;
 import com.muchinfo.mtp3pojos.entity.Systemmanager;
 import com.muchinfo.mtp3pojos.entity.Systemparam;
+import com.muchinfo.mtp3pojos.vo.I18nconfig;
 import com.muchinfo.mtp3pojos.vo.systemsetup.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,6 +26,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 @Service
@@ -129,9 +131,13 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
     }
 
     @Override
-    public AjaxResult<SystemMarketSetDetail> marketSetDetail(SystemErrorCodeParam param, HttpServletRequest request) {
-        
-        return null;
+    public AjaxResult<SystemMarketSetDetail> marketSetDetail(Integer marketsectionid, HttpServletRequest request) {
+        SystemMarketSetDetail detail = iSystemmanagerMapper.queryMarketSectionBean(marketsectionid);
+        List<ListMarketSectionConfig> configs = iSystemmanagerMapper.queryMarketSectionConfigNewList(marketsectionid);
+        detail.setConfigs(configs);
+        List<I18nconfig> i18nconfigs = iSystemmanagerMapper.queryI18nConfigs();
+        detail.setI18nconfigs(i18nconfigs);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"),detail);
     }
 
     private void updateTerminalSysParam(SystemParamUpdate sysparm, Systemmanager systemmanager, Systemparam old) {

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -1665,7 +1665,9 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
         }
         result.setAccountname(iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", result.getUserid())).getAccountname());
-        result.setAuditusername(iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("autoid", result.getAuditid())).getUsername());
+        if(result.getAuditid() != null){
+            result.setAuditusername(iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("autoid", result.getAuditid())).getUsername());
+        }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
     }
 

mtp3-century/src/main/resources/mapper/SystemmanagerMapper.xml

@@ -329,4 +329,39 @@
         </where>
         order by m.orderindex
     </select>
+    <select id="queryMarketSectionBean" resultType="com.muchinfo.mtp3pojos.vo.systemsetup.SystemMarketSetDetail"
+            parameterType="java.lang.Integer">
+        select
+            m.marketsectionid,m.marketsectionname,m.pictureurl,
+            m.marketsectionnameen,m.marketsectionnamezh_tw,m.marketsectionnameth,m.marketsectionnamevi
+            m.orderindex,to_char(m.modifytime,'yyyy-MM-dd hh24:mi:ss') modifytimestr,
+            decode(m.modifiersrc,1,s.username,ui.customername) modifiername
+        from MarketSection m
+        left join systemmanager s on m.modifierid = s.autoid
+        left join loginaccount la on m.modifierid = la.loginid
+        left join userinfo ui on la.userid = ui.userid
+        <where>   m.isvalid ='1'
+            <if test="marketsectionid!=null and marketsectionid!=''">
+                and  m.marketsectionid = #{marketsectionid }
+            </if>
+        </where>
+        order by m.orderindex
+    </select>
+    <select id="queryMarketSectionConfigNewList"
+            resultType="com.muchinfo.mtp3pojos.vo.systemsetup.ListMarketSectionConfig"
+            parameterType="java.lang.Integer">
+        select ms.marketsectionid, ms.displayname, ms.marketids,
+               ms.orderindex, ms.trademode,
+               (select LISTAGG(m.marketname, ',')   within group (order by marketid) as marketnames
+        from market m where ',' || ms.marketids || ',' like '%,' ||  m.marketid || ',%') as marketnames,
+            ms.displaynameen, ms.displaynamezh_tw, ms.displaynameth, ms.displaynamevi
+        from MarketSectionConfigNew ms
+        where ms.marketsectionid = #{marketsectionid }
+        order by ms.orderindex
+    </select>
+    <select id="queryI18nConfigs" resultType="com.muchinfo.mtp3pojos.vo.I18nconfig">
+        select langcode "langcode", langname "langname"
+        from i18nconfig
+        where isvalid = 1
+    </select>
 </mapper>

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISystemmanagerMapper.java

@@ -3,13 +3,16 @@ package com.muchinfo.mtp3interface.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.muchinfo.mtp3pojos.entity.Systemmanager;
+import com.muchinfo.mtp3pojos.vo.I18nconfig;
 import com.muchinfo.mtp3pojos.vo.marketrun.MarketRunLoginUserResult;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountOrgan2UserResult;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountSelfsupportParam;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountSelfsupportResult;
 import com.muchinfo.mtp3pojos.vo.systemrun.*;
+import com.muchinfo.mtp3pojos.vo.systemsetup.ListMarketSectionConfig;
 import com.muchinfo.mtp3pojos.vo.systemsetup.SystemMarketSectionParam;
 import com.muchinfo.mtp3pojos.vo.systemsetup.SystemMarketSectionResult;
+import com.muchinfo.mtp3pojos.vo.systemsetup.SystemMarketSetDetail;
 import com.muchinfo.mtp3pojos.vo.systemuser.SystemUserReqParam;
 import com.muchinfo.mtp3pojos.vo.systemuser.SystemUserResResult;
 import org.apache.ibatis.annotations.Mapper;
@@ -53,4 +56,10 @@ public interface ISystemmanagerMapper extends BaseMapper<Systemmanager> {
     List<LoginLogQueryResult> queryloginlog(@Param("vo") LoginLogQueryParam param);
 
     IPage<SystemMarketSectionResult> queryMarketSet(IPage<SystemMarketSectionResult> page, @Param("vo") SystemMarketSectionParam param);
+
+    SystemMarketSetDetail queryMarketSectionBean(@Param("marketsectionid") Integer marketsectionid);
+
+    List<ListMarketSectionConfig> queryMarketSectionConfigNewList(@Param("marketsectionid") Integer marketsectionid);
+
+    List<I18nconfig> queryI18nConfigs();
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/I18nconfig.java

@@ -0,0 +1,19 @@
+package com.muchinfo.mtp3pojos.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value="I18nconfig对象", description="")
+public class I18nconfig {
+
+    private String langcode;
+
+    private String langname;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/ListMarketSectionConfig.java

@@ -0,0 +1,29 @@
+package com.muchinfo.mtp3pojos.vo.systemsetup;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "ListMarketSectionConfig对象", description = "市场板块设置详情")
+public class ListMarketSectionConfig {
+
+    private Integer orderindex;
+
+    private String displayname;
+
+    private String displaynameen;
+
+    private String displaynamezh_tw;
+
+    private String displaynameth;
+
+    private String displaynamevi;
+
+    private String marketnames;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/systemsetup/SystemMarketSetDetail.java

@@ -1,11 +1,15 @@
 package com.muchinfo.mtp3pojos.vo.systemsetup;
 
+import com.muchinfo.mtp3pojos.vo.I18nconfig;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Builder
 @Data
 @AllArgsConstructor
@@ -13,5 +17,30 @@ import lombok.NoArgsConstructor;
 @ApiModel(value = "SystemMarketSetDetail对象", description = "市场板块设置详情")
 public class SystemMarketSetDetail {
 
-    private Long id;
+    @ApiModelProperty(value = "名称(中文)")
+    private String marketsectionname;
+
+    private String marketsectionnameen;
+
+    private String marketsectionnamezh_tw;
+
+    private String marketsectionnameth;
+
+    private String marketsectionnamevi;
+
+    @ApiModelProperty(value = "排序")
+    private Integer orderindex;
+
+    @ApiModelProperty(value = "图片")
+    private String pictureurl;
+
+    private List<ListMarketSectionConfig> configs;
+
+    @ApiModelProperty(value = "更新时间")
+    private String modifytimestr;
+
+    @ApiModelProperty(value = "操作人")
+    private String modifiername;
+
+    private List<I18nconfig> i18nconfigs;
 }