antissoft / lvqianmeiye_ERP

Commit 9e55866f54fec06627bc1b02519549418e05cd33

Authored by “wangming”
1 parent 505dccc3

优化代码格式，合并多行表达式，提升代码可读性和整洁性。

Inline Side-by-side
Showing 3 changed files with 33 additions and 131 deletions
netcore/src/Modularity/Extend/NCC.Extend/LqLssjService.cs
  View file @9e55866
... ... @@ -186,19 +186,13 @@ namespace NCC.Extend.LqLssj
186 186 var isExist = paramList.Find(p => p.field == item);
187 187 if (isExist != null)
188 188 {
189   - excelconfig.ColumnModel.Add(
190   - new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value }
191   - );
  189 + excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value });
192 190 }
193 191 }
194 192 var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName;
195 193 ExcelExportHelper<LqLssjListOutput>.Export(exportData, excelconfig, addPath);
196 194 var fileName = _userManager.UserId + "|" + addPath + "|xls";
197   - var output = new
198   - {
199   - name = excelconfig.FileName,
200   - url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC"),
201   - };
  195 + var output = new { name = excelconfig.FileName, url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") };
202 196 return output;
203 197 }
204 198  
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqMdMdlbjhsxxService.cs
  View file @9e55866
... ... @@ -92,60 +92,22 @@ namespace NCC.Extend.LqMdMdlbjhsxx
92 92 .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
93 93 .WhereIF(!string.IsNullOrEmpty(input.dxmbls), p => p.Dxmbls.Equals(input.dxmbls))
94 94 .WhereIF(!string.IsNullOrEmpty(input.dxmb), p => p.Dxmb.Equals(input.dxmb))
95   - .WhereIF(
96   - queryKssj != null,
97   - p => p.Kssj >= new DateTime(startKssj.ToDate().Year, startKssj.ToDate().Month, startKssj.ToDate().Day, 0, 0, 0)
98   - )
99   - .WhereIF(
100   - queryKssj != null,
101   - p => p.Kssj <= new DateTime(endKssj.ToDate().Year, endKssj.ToDate().Month, endKssj.ToDate().Day, 23, 59, 59)
102   - )
103   - .WhereIF(
104   - queryJssj != null,
105   - p => p.Jssj >= new DateTime(startJssj.ToDate().Year, startJssj.ToDate().Month, startJssj.ToDate().Day, 0, 0, 0)
106   - )
107   - .WhereIF(
108   - queryJssj != null,
109   - p => p.Jssj <= new DateTime(endJssj.ToDate().Year, endJssj.ToDate().Month, endJssj.ToDate().Day, 23, 59, 59)
110   - )
  95 + .WhereIF(queryKssj != null, p => p.Kssj >= new DateTime(startKssj.ToDate().Year, startKssj.ToDate().Month, startKssj.ToDate().Day, 0, 0, 0))
  96 + .WhereIF(queryKssj != null, p => p.Kssj <= new DateTime(endKssj.ToDate().Year, endKssj.ToDate().Month, endKssj.ToDate().Day, 23, 59, 59))
  97 + .WhereIF(queryJssj != null, p => p.Jssj >= new DateTime(startJssj.ToDate().Year, startJssj.ToDate().Month, startJssj.ToDate().Day, 0, 0, 0))
  98 + .WhereIF(queryJssj != null, p => p.Jssj <= new DateTime(endJssj.ToDate().Year, endJssj.ToDate().Month, endJssj.ToDate().Day, 23, 59, 59))
111 99 .WhereIF(!string.IsNullOrEmpty(input.syb), p => p.Syb.Equals(input.syb))
112   - .WhereIF(
113   - querySybssksrq != null,
114   - p =>
115   - p.Sybssksrq >= new DateTime(startSybssksrq.ToDate().Year, startSybssksrq.ToDate().Month, startSybssksrq.ToDate().Day, 0, 0, 0)
116   - )
117   - .WhereIF(
118   - querySybssksrq != null,
119   - p => p.Sybssksrq <= new DateTime(endSybssksrq.ToDate().Year, endSybssksrq.ToDate().Month, endSybssksrq.ToDate().Day, 23, 59, 59)
120   - )
121   - .WhereIF(
122   - querySybsszzrq != null,
123   - p =>
124   - p.Sybsszzrq >= new DateTime(startSybsszzrq.ToDate().Year, startSybsszzrq.ToDate().Month, startSybsszzrq.ToDate().Day, 0, 0, 0)
125   - )
126   - .WhereIF(
127   - querySybsszzrq != null,
128   - p => p.Sybsszzrq <= new DateTime(endSybsszzrq.ToDate().Year, endSybsszzrq.ToDate().Month, endSybsszzrq.ToDate().Day, 23, 59, 59)
129   - )
  100 + .WhereIF(querySybssksrq != null, p => p.Sybssksrq >= new DateTime(startSybssksrq.ToDate().Year, startSybssksrq.ToDate().Month, startSybssksrq.ToDate().Day, 0, 0, 0))
  101 + .WhereIF(querySybssksrq != null, p => p.Sybssksrq <= new DateTime(endSybssksrq.ToDate().Year, endSybssksrq.ToDate().Month, endSybssksrq.ToDate().Day, 23, 59, 59))
  102 + .WhereIF(querySybsszzrq != null, p => p.Sybsszzrq >= new DateTime(startSybsszzrq.ToDate().Year, startSybsszzrq.ToDate().Month, startSybsszzrq.ToDate().Day, 0, 0, 0))
  103 + .WhereIF(querySybsszzrq != null, p => p.Sybsszzrq <= new DateTime(endSybsszzrq.ToDate().Year, endSybsszzrq.ToDate().Month, endSybsszzrq.ToDate().Day, 23, 59, 59))
130 104 .WhereIF(!string.IsNullOrEmpty(input.mdlxLd), p => p.MdlxLd.Equals(input.mdlxLd))
131 105 .WhereIF(!string.IsNullOrEmpty(input.mdzt), p => p.Mdzt.Equals(input.mdzt))
132 106 .WhereIF(!string.IsNullOrEmpty(input.mdlxXd), p => p.MdlxXd.Equals(input.mdlxXd))
133   - .WhereIF(
134   - queryXdssksrq != null,
135   - p => p.Xdssksrq >= new DateTime(startXdssksrq.ToDate().Year, startXdssksrq.ToDate().Month, startXdssksrq.ToDate().Day, 0, 0, 0)
136   - )
137   - .WhereIF(
138   - queryXdssksrq != null,
139   - p => p.Xdssksrq <= new DateTime(endXdssksrq.ToDate().Year, endXdssksrq.ToDate().Month, endXdssksrq.ToDate().Day, 23, 59, 59)
140   - )
141   - .WhereIF(
142   - queryXdsszzrq != null,
143   - p => p.Xdsszzrq >= new DateTime(startXdsszzrq.ToDate().Year, startXdsszzrq.ToDate().Month, startXdsszzrq.ToDate().Day, 0, 0, 0)
144   - )
145   - .WhereIF(
146   - queryXdsszzrq != null,
147   - p => p.Xdsszzrq <= new DateTime(endXdsszzrq.ToDate().Year, endXdsszzrq.ToDate().Month, endXdsszzrq.ToDate().Day, 23, 59, 59)
148   - )
  107 + .WhereIF(queryXdssksrq != null, p => p.Xdssksrq >= new DateTime(startXdssksrq.ToDate().Year, startXdssksrq.ToDate().Month, startXdssksrq.ToDate().Day, 0, 0, 0))
  108 + .WhereIF(queryXdssksrq != null, p => p.Xdssksrq <= new DateTime(endXdssksrq.ToDate().Year, endXdssksrq.ToDate().Month, endXdssksrq.ToDate().Day, 23, 59, 59))
  109 + .WhereIF(queryXdsszzrq != null, p => p.Xdsszzrq >= new DateTime(startXdsszzrq.ToDate().Year, startXdsszzrq.ToDate().Month, startXdsszzrq.ToDate().Day, 0, 0, 0))
  110 + .WhereIF(queryXdsszzrq != null, p => p.Xdsszzrq <= new DateTime(endXdsszzrq.ToDate().Year, endXdsszzrq.ToDate().Month, endXdsszzrq.ToDate().Day, 23, 59, 59))
149 111 .WhereIF(!string.IsNullOrEmpty(input.smxgd), p => p.Smxgd.Contains(input.smxgd))
150 112 .Select(it => new LqMdMdlbjhsxxListOutput
151 113 {
... ... @@ -221,60 +183,22 @@ namespace NCC.Extend.LqMdMdlbjhsxx
221 183 .WhereIF(!string.IsNullOrEmpty(input.md), p => p.Md.Equals(input.md))
222 184 .WhereIF(!string.IsNullOrEmpty(input.dxmbls), p => p.Dxmbls.Equals(input.dxmbls))
223 185 .WhereIF(!string.IsNullOrEmpty(input.dxmb), p => p.Dxmb.Equals(input.dxmb))
224   - .WhereIF(
225   - queryKssj != null,
226   - p => p.Kssj >= new DateTime(startKssj.ToDate().Year, startKssj.ToDate().Month, startKssj.ToDate().Day, 0, 0, 0)
227   - )
228   - .WhereIF(
229   - queryKssj != null,
230   - p => p.Kssj <= new DateTime(endKssj.ToDate().Year, endKssj.ToDate().Month, endKssj.ToDate().Day, 23, 59, 59)
231   - )
232   - .WhereIF(
233   - queryJssj != null,
234   - p => p.Jssj >= new DateTime(startJssj.ToDate().Year, startJssj.ToDate().Month, startJssj.ToDate().Day, 0, 0, 0)
235   - )
236   - .WhereIF(
237   - queryJssj != null,
238   - p => p.Jssj <= new DateTime(endJssj.ToDate().Year, endJssj.ToDate().Month, endJssj.ToDate().Day, 23, 59, 59)
239   - )
  186 + .WhereIF(queryKssj != null, p => p.Kssj >= new DateTime(startKssj.ToDate().Year, startKssj.ToDate().Month, startKssj.ToDate().Day, 0, 0, 0))
  187 + .WhereIF(queryKssj != null, p => p.Kssj <= new DateTime(endKssj.ToDate().Year, endKssj.ToDate().Month, endKssj.ToDate().Day, 23, 59, 59))
  188 + .WhereIF(queryJssj != null, p => p.Jssj >= new DateTime(startJssj.ToDate().Year, startJssj.ToDate().Month, startJssj.ToDate().Day, 0, 0, 0))
  189 + .WhereIF(queryJssj != null, p => p.Jssj <= new DateTime(endJssj.ToDate().Year, endJssj.ToDate().Month, endJssj.ToDate().Day, 23, 59, 59))
240 190 .WhereIF(!string.IsNullOrEmpty(input.syb), p => p.Syb.Equals(input.syb))
241   - .WhereIF(
242   - querySybssksrq != null,
243   - p =>
244   - p.Sybssksrq >= new DateTime(startSybssksrq.ToDate().Year, startSybssksrq.ToDate().Month, startSybssksrq.ToDate().Day, 0, 0, 0)
245   - )
246   - .WhereIF(
247   - querySybssksrq != null,
248   - p => p.Sybssksrq <= new DateTime(endSybssksrq.ToDate().Year, endSybssksrq.ToDate().Month, endSybssksrq.ToDate().Day, 23, 59, 59)
249   - )
250   - .WhereIF(
251   - querySybsszzrq != null,
252   - p =>
253   - p.Sybsszzrq >= new DateTime(startSybsszzrq.ToDate().Year, startSybsszzrq.ToDate().Month, startSybsszzrq.ToDate().Day, 0, 0, 0)
254   - )
255   - .WhereIF(
256   - querySybsszzrq != null,
257   - p => p.Sybsszzrq <= new DateTime(endSybsszzrq.ToDate().Year, endSybsszzrq.ToDate().Month, endSybsszzrq.ToDate().Day, 23, 59, 59)
258   - )
  191 + .WhereIF(querySybssksrq != null, p => p.Sybssksrq >= new DateTime(startSybssksrq.ToDate().Year, startSybssksrq.ToDate().Month, startSybssksrq.ToDate().Day, 0, 0, 0))
  192 + .WhereIF(querySybssksrq != null, p => p.Sybssksrq <= new DateTime(endSybssksrq.ToDate().Year, endSybssksrq.ToDate().Month, endSybssksrq.ToDate().Day, 23, 59, 59))
  193 + .WhereIF(querySybsszzrq != null, p => p.Sybsszzrq >= new DateTime(startSybsszzrq.ToDate().Year, startSybsszzrq.ToDate().Month, startSybsszzrq.ToDate().Day, 0, 0, 0))
  194 + .WhereIF(querySybsszzrq != null, p => p.Sybsszzrq <= new DateTime(endSybsszzrq.ToDate().Year, endSybsszzrq.ToDate().Month, endSybsszzrq.ToDate().Day, 23, 59, 59))
259 195 .WhereIF(!string.IsNullOrEmpty(input.mdlxLd), p => p.MdlxLd.Equals(input.mdlxLd))
260 196 .WhereIF(!string.IsNullOrEmpty(input.mdzt), p => p.Mdzt.Equals(input.mdzt))
261 197 .WhereIF(!string.IsNullOrEmpty(input.mdlxXd), p => p.MdlxXd.Equals(input.mdlxXd))
262   - .WhereIF(
263   - queryXdssksrq != null,
264   - p => p.Xdssksrq >= new DateTime(startXdssksrq.ToDate().Year, startXdssksrq.ToDate().Month, startXdssksrq.ToDate().Day, 0, 0, 0)
265   - )
266   - .WhereIF(
267   - queryXdssksrq != null,
268   - p => p.Xdssksrq <= new DateTime(endXdssksrq.ToDate().Year, endXdssksrq.ToDate().Month, endXdssksrq.ToDate().Day, 23, 59, 59)
269   - )
270   - .WhereIF(
271   - queryXdsszzrq != null,
272   - p => p.Xdsszzrq >= new DateTime(startXdsszzrq.ToDate().Year, startXdsszzrq.ToDate().Month, startXdsszzrq.ToDate().Day, 0, 0, 0)
273   - )
274   - .WhereIF(
275   - queryXdsszzrq != null,
276   - p => p.Xdsszzrq <= new DateTime(endXdsszzrq.ToDate().Year, endXdsszzrq.ToDate().Month, endXdsszzrq.ToDate().Day, 23, 59, 59)
277   - )
  198 + .WhereIF(queryXdssksrq != null, p => p.Xdssksrq >= new DateTime(startXdssksrq.ToDate().Year, startXdssksrq.ToDate().Month, startXdssksrq.ToDate().Day, 0, 0, 0))
  199 + .WhereIF(queryXdssksrq != null, p => p.Xdssksrq <= new DateTime(endXdssksrq.ToDate().Year, endXdssksrq.ToDate().Month, endXdssksrq.ToDate().Day, 23, 59, 59))
  200 + .WhereIF(queryXdsszzrq != null, p => p.Xdsszzrq >= new DateTime(startXdsszzrq.ToDate().Year, startXdsszzrq.ToDate().Month, startXdsszzrq.ToDate().Day, 0, 0, 0))
  201 + .WhereIF(queryXdsszzrq != null, p => p.Xdsszzrq <= new DateTime(endXdsszzrq.ToDate().Year, endXdsszzrq.ToDate().Month, endXdsszzrq.ToDate().Day, 23, 59, 59))
278 202 .WhereIF(!string.IsNullOrEmpty(input.smxgd), p => p.Smxgd.Contains(input.smxgd))
279 203 .Select(it => new LqMdMdlbjhsxxListOutput
280 204 {
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqMdXdbhsjService.cs
  View file @9e55866
... ... @@ -39,10 +39,7 @@ namespace NCC.Extend.LqMdXdbhsj
39 39 /// <summary>
40 40 /// 初始化一个<see cref="LqMdXdbhsjService"/>类型的新实例
41 41 /// </summary>
42   - public LqMdXdbhsjService(
43   - ISqlSugarRepository<LqMdXdbhsjEntity> lqMdXdbhsjRepository,
44   - IUserManager userManager
45   - )
  42 + public LqMdXdbhsjService(ISqlSugarRepository<LqMdXdbhsjEntity> lqMdXdbhsjRepository, IUserManager userManager)
46 43 {
47 44 _lqMdXdbhsjRepository = lqMdXdbhsjRepository;
48 45 _db = _lqMdXdbhsjRepository.Context;
... ... @@ -115,9 +112,7 @@ namespace NCC.Extend.LqMdXdbhsj
115 112 var exists = await _db.Queryable<LqMdXdbhsjEntity>()
116 113 .Where(p => p.Mdid == entity.Mdid && p.Sfqy == 1)
117 114 .Where(p =>
118   - (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj)
119   - || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj)
120   - || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj)
  115 + (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj) || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj) || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj)
121 116 )
122 117 .AnyAsync();
123 118  
... ... @@ -126,9 +121,7 @@ namespace NCC.Extend.LqMdXdbhsj
126 121 throw NCCException.Oh(ErrorCode.COM1000, "该门店在指定时间段内已存在保护时间设置");
127 122 }
128 123  
129   - var isOk = await _db.Insertable(entity)
130   - .IgnoreColumns(ignoreNullColumn: true)
131   - .ExecuteCommandAsync();
  124 + var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync();
132 125 if (!(isOk > 0))
133 126 throw NCCException.Oh(ErrorCode.COM1000);
134 127 }
... ... @@ -155,9 +148,7 @@ namespace NCC.Extend.LqMdXdbhsj
155 148 var exists = await _db.Queryable<LqMdXdbhsjEntity>()
156 149 .Where(p => p.Mdid == entity.Mdid && p.Sfqy == 1 && p.Id != id)
157 150 .Where(p =>
158   - (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj)
159   - || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj)
160   - || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj)
  151 + (p.Bhkssj <= entity.Bhkssj && p.Bhjssj > entity.Bhkssj) || (p.Bhkssj < entity.Bhjssj && p.Bhjssj >= entity.Bhjssj) || (p.Bhkssj >= entity.Bhkssj && p.Bhjssj <= entity.Bhjssj)
161 152 )
162 153 .AnyAsync();
163 154  
... ... @@ -166,9 +157,7 @@ namespace NCC.Extend.LqMdXdbhsj
166 157 throw NCCException.Oh(ErrorCode.COM1000, "该门店在指定时间段内已存在保护时间设置");
167 158 }
168 159  
169   - var isOk = await _db.Updateable(entity)
170   - .IgnoreColumns(ignoreAllNullColumns: true)
171   - .ExecuteCommandAsync();
  160 + var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
172 161 if (!(isOk > 0))
173 162 throw NCCException.Oh(ErrorCode.COM1001);
174 163 }
... ... @@ -182,9 +171,7 @@ namespace NCC.Extend.LqMdXdbhsj
182 171 {
183 172 var entity = await _db.Queryable<LqMdXdbhsjEntity>().FirstAsync(p => p.Id == id);
184 173 _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005);
185   - var isOk = await _db.Deleteable<LqMdXdbhsjEntity>()
186   - .Where(d => d.Id == id)
187   - .ExecuteCommandAsync();
  174 + var isOk = await _db.Deleteable<LqMdXdbhsjEntity>().Where(d => d.Id == id).ExecuteCommandAsync();
188 175 if (!(isOk > 0))
189 176 throw NCCException.Oh(ErrorCode.COM1002);
190 177 }
... ... @@ -217,10 +204,7 @@ namespace NCC.Extend.LqMdXdbhsj
217 204 public async Task<dynamic> GetByStoreId(string mdid)
218 205 {
219 206 var now = DateTime.Now;
220   - var entity = await _db.Queryable<LqMdXdbhsjEntity>()
221   - .Where(p => p.Mdid == mdid && p.Sfqy == 1)
222   - .Where(p => p.Bhkssj <= now && p.Bhjssj >= now)
223   - .FirstAsync();
  207 + var entity = await _db.Queryable<LqMdXdbhsjEntity>().Where(p => p.Mdid == mdid && p.Sfqy == 1).Where(p => p.Bhkssj <= now && p.Bhjssj >= now).FirstAsync();
224 208  
225 209 if (entity == null)
226 210 {
... ...