yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 6854ce2788 2172931c71
commit 8d332250d7
5 changed files with 270 additions and 272 deletions
Show Stats Download Patch File Download Diff File

16
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/controller/Jg_naturalController.java
Unescape View File

@ -38,8 +38,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
*
* jg_natural * jg_natural
*
* @版本： V3.2.0 * @版本： V3.2.0
* @版权： LINKAGE-BOOT * @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队 * @作者： LINKAGE-BOOT研发团队
@ -64,8 +64,6 @@ public class Jg_naturalController {
private Jg_naturalService jg_naturalService; private Jg_naturalService jg_naturalService;
/** /**
* 列表 * 列表
* *
@ -81,8 +79,6 @@ public class Jg_naturalController {
List<Jg_naturalListVO> listVO = JsonUtil.getJsonToList(list, Jg_naturalListVO.class); List<Jg_naturalListVO> listVO = JsonUtil.getJsonToList(list, Jg_naturalListVO.class);
for (Jg_naturalListVO jg_naturalVO : listVO) { for (Jg_naturalListVO jg_naturalVO : listVO) {
} }
PageListVO vo = new PageListVO(); PageListVO vo = new PageListVO();
vo.setList(listVO); vo.setList(listVO);
PaginationVO page = JsonUtil.getJsonToBean(jg_naturalPagination, PaginationVO.class); PaginationVO page = JsonUtil.getJsonToBean(jg_naturalPagination, PaginationVO.class);
@ -112,7 +108,6 @@ public class Jg_naturalController {
} }
/** /**
* 模板下载 * 模板下载
* *
@ -131,6 +126,7 @@ public class Jg_naturalController {
} }
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 导出Excel * 导出Excel
* *
@ -158,6 +154,7 @@ public class Jg_naturalController {
DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), mapList, keys, userInfo); DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), mapList, keys, userInfo);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
//导出表格 //导出表格
public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo) { public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo) {
DownloadVO vo = DownloadVO.builder().build(); DownloadVO vo = DownloadVO.builder().build();
@ -273,8 +270,6 @@ public class Jg_naturalController {
} }
/** /**
* 更新 * 更新
* *
@ -297,7 +292,6 @@ public class Jg_naturalController {
} }
/** /**
* 删除 * 删除
* *
@ -316,8 +310,4 @@ public class Jg_naturalController {
} }
} }

5
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java
Unescape View File

@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
*
* jg_natural * jg_natural
* 版本： V3.2.0 * 版本： V3.2.0
* 版权： LINKAGE-BOOT * 版权： LINKAGE-BOOT
@ -47,12 +46,11 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
private Jg_naturalMapper naturalMapper; private Jg_naturalMapper naturalMapper;
@Override @Override
public List<Jg_naturalMobileEntity> getList(Jg_naturalPagination jg_naturalPagination) { public List<Jg_naturalMobileEntity> getList(Jg_naturalPagination jg_naturalPagination) {
String userId = userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList = new ArrayList(); List<String> AllIdList = new ArrayList();
System.out.println(AllIdList);
int total = 0; int total = 0;
int jg_naturalNum = 0; int jg_naturalNum = 0;
QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper = new QueryWrapper<>(); QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper = new QueryWrapper<>();
@ -219,6 +217,7 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
entity.setId(id); entity.setId(id);
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(Jg_naturalEntity entity) { public void delete(Jg_naturalEntity entity) {
if (entity != null) { if (entity != null) {

10
SC-boot/linkage-scm/src/main/resources/mapper/natural/Jg_naturalMapper.xml
Unescape View File

@ -21,6 +21,11 @@
a.adress, a.adress,
a.`name`, a.`name`,
a.contact, a.contact,
a.identity,
a.bank_account,
a.bank,
a.bank_no,
a.photos,
COUNT( b.id ) naturalCount, COUNT( b.id ) naturalCount,
IFNULL( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END ), 0 ) naturalSum IFNULL( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement / 1000 END ), 0 ) naturalSum
FROM FROM
@ -50,6 +55,11 @@
<result column="adress" property="adress"/> <result column="adress" property="adress"/>
<result column="name" property="name"/> <result column="name" property="name"/>
<result column="contact" property="contact"/> <result column="contact" property="contact"/>
<result column="identity" property="identity"/>
<result column="bank_account" property="bankAccount"/>
<result column="bank" property="bank"/>
<result column="bank_no" property="bankNo"/>
<result column="photos" property="photos"/>
<result column="naturalSum" property="naturalSum"/> <result column="naturalSum" property="naturalSum"/>
<result column="naturalCount" property="naturalCount"/> <result column="naturalCount" property="naturalCount"/>
</resultMap> </resultMap>

19
SC-web/src/views/scm/basicInformation/natural/Form.vue
Unescape View File

@ -28,14 +28,16 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="手机号" prop="contact"> <el-form-item label="手机号" prop="contact">
<el-input v-model="dataForm.contact" placeholder="请输入手机号" clearable :style='{ "width": "100%" }'> <el-input v-model="dataForm.contact" placeholder="请输入手机号" clearable
:style='{ "width": "100%" }'>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="身份证" prop="identity"> <el-form-item label="身份证" prop="identity">
<el-input v-model="dataForm.identity" placeholder="请输入身份证" clearable :style='{ "width": "100%" }'> <el-input v-model="dataForm.identity" placeholder="请输入身份证" clearable
:style='{ "width": "100%" }'>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -69,14 +71,6 @@
</JNPF-UploadImg> </JNPF-UploadImg>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="录入人" prop="creatorUserName">
<el-input v-model="dataForm.creatorUserName" placeholder="请输入录入人" clearable
:style='{ "width": "100%" }'>
</el-input>
</el-form-item>
</el-col>
</template> </template>
</el-form> </el-form>
</el-row> </el-row>
@ -106,7 +100,7 @@ export default {
bankAccount: '', bankAccount: '',
bank: '', bank: '',
bankNo: '', bankNo: '',
photos: [], photos: null,
creatorUserName: '', creatorUserName: '',
creatorTime: "", creatorTime: "",
}, },
@ -152,6 +146,9 @@ export default {
url: '/api/example/Jg_natural/' + this.dataForm.id, url: '/api/example/Jg_natural/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
if (res.data.photos == null) {
res.data.photos = JSON.stringify([]);
}
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}); });

22
SC-web/src/views/scm/basicInformation/natural/index.vue
Unescape View File

@ -60,16 +60,15 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange" border>
<el-table-column prop="name" label="姓名" width="0" align="left" /> <el-table-column prop="name" label="姓名" width="0" align="center" sortable />
<el-table-column prop="adress" label="地址" width="0" align="left" /> <el-table-column prop="adress" label="地址" width="0" align="center" sortable />
<el-table-column prop="contact" label="手机号" width="0" align="left" /> <el-table-column prop="contact" label="手机号" width="0" align="center" sortable />
<el-table-column prop="creatorUserName" label="录入人" width="0" align="left" /> <el-table-column prop="creatorTime" label="创建时间" width="0" align="center" sortable />
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left" /> <el-table-column prop="identity" label="身份证" width="0" align="center" sortable />
<el-table-column prop="identity" label="身份证" width="0" align="left" /> <el-table-column prop="bankAccount" label="银行账户" width="0" align="center" sortable />
<el-table-column prop="bankAccount" label="银行账户" width="0" align="left" /> <el-table-column prop="bank" label="开户行" width="0" align="center" sortable />
<el-table-column prop="bank" label="开户行" width="0" align="left" /> <el-table-column prop="bankNo" label="行号" width="0" align="center" sortable />
<el-table-column prop="bankNo" label="行号" width="0" align="left" />
<el-table-column label="操作" fixed="right" width="100"> <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑 <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑
@ -171,9 +170,12 @@ export default {
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
console.log(res)
var _list = []; var _list = [];
for (let i = 0; i < res.data.list.length; i++) { for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i]; let _data = res.data.list[i];
console.log(_data);
i
_list.push(_data) _list.push(_data)
} }
this.list = _list this.list = _list

Write Preview
Loading…
Cancel
Save